[PHP-CVS] cvs: php4 / NEWS /ext/mysql/libmysql acinclude.m4 bmove.c charset.c config-win.h dbug.h default.c errors.c fix_copyright global.h libmysql.c m_string.h mf_dirname.c mf_format.c mf_pack.c mf_path.c my_alloc.c my_create.c my_fopen.c my_init.c my_open.c my_pthread.c my_pthread.h my_static.c my_static.h my_sys.h my_thr_init.c my_wincond.c my_write.c mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h net.c raid.h safemalloc.c string.c thr_alarm.h thr_mutex.c typelib.c update_sources violite.c violite.h

2001-01-23 Thread MySQL Team

mysql   Tue Jan 23 08:48:51 2001 EDT

  Added files: 
/php4/ext/mysql/libmysqlupdate_sources 

  Modified files:  
/php4   NEWS 
/php4/ext/mysql/libmysqlraid.h acinclude.m4 bmove.c charset.c 
config-win.h dbug.h default.c errors.c 
fix_copyright global.h libmysql.c 
m_string.h mf_dirname.c mf_format.c 
mf_pack.c mf_path.c my_alloc.c my_create.c 
my_fopen.c my_init.c my_open.c 
my_pthread.c my_pthread.h my_static.c 
my_static.h my_sys.h my_thr_init.c 
my_wincond.c my_write.c mysql.h 
mysql_com.h mysql_version.h mysqld_error.h 
mysys_err.h net.c safemalloc.c string.c 
thr_alarm.h thr_mutex.c typelib.c 
violite.c violite.h 
  Log:
  Upgrade ext/mysql/libmysql to version 3.23.32.  One notable bug fix is
  that the client can now connect to a server which is using a default
  charset other than latin1.
  
  

Index: php4/NEWS
diff -u php4/NEWS:1.570 php4/NEWS:1.571
--- php4/NEWS:1.570 Tue Jan 23 07:30:27 2001
+++ php4/NEWS   Tue Jan 23 08:48:49 2001
@@ -2,6 +2,7 @@
 |||
 
 ?? ??? 200?, Version 4.0.5
+- Updated ext/mysql/libmysql to version 3.23.32; bug fixes ([EMAIL PROTECTED])
 - Fixed possible crash in all (non-pcre) regex functions. (Thies)
 - Improved str_replace() to accept an array for any parameter - similar
   to preg_replace(). (Andrei)
Index: php4/ext/mysql/libmysql/raid.h
diff -u /dev/null php4/ext/mysql/libmysql/raid.h:1.3
--- /dev/null   Tue Jan 23 08:48:50 2001
+++ php4/ext/mysql/libmysql/raid.h  Tue Jan 23 08:48:49 2001
@@ -0,0 +1,147 @@
+/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB 
+This file is public domain and comes with NO WARRANTY of any kind */
+
+/* Parser needs these defines  always, even if USE_RAID is not defined */
+#define RAID_TYPE_0 1   /* Striping */
+#define RAID_TYPE_x 2   /* Some new modes */
+#define RAID_TYPE_y 3
+
+#define RAID_DEFAULT_CHUNKS 4
+#define RAID_DEFAULT_CHUNKSIZE 256*1024 /* 256kB */
+
+extern const char *raid_type_string[];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+const char *my_raid_type(int raid_type);
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef USE_RAID
+
+#ifdef __GNUC__
+#pragma interface  /* gcc class implementation */
+#endif
+#include "my_dir.h"
+
+/* Trap all occurences of my_...() in source and use our wrapper around this function 
+*/
+
+#ifdef MAP_TO_USE_RAID
+#define my_read(A,B,C,D) my_raid_read(A,B,C,D)
+#define my_write(A,B,C,D)my_raid_write(A,B,C,D)
+#define my_pwrite(A,B,C,D,E) my_raid_pwrite(A,B,C,D,E)
+#define my_pread(A,B,C,D,E)  my_raid_pread(A,B,C,D,E)
+#define my_chsize(A,B,C) my_raid_chsize(A,B,C)
+#define my_close(A,B)my_raid_close(A,B)
+#define my_tell(A,B) my_raid_tell(A,B)
+#define my_seek(A,B,C,D) my_raid_seek(A,B,C,D)
+#define my_lock(A,B,C,D,E) my_raid_lock(A,B,C,D,E)
+#define my_fstat(A,B,C) my_raid_fstat(A,B,C)
+#endif /* MAP_TO_USE_RAID */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  void init_raid(void);
+  void end_raid(void);
+
+  bool is_raid(File fd);
+  File my_raid_create(const char *FileName, int CreateFlags, int access_flags,
+ uint raid_type, uint raid_chunks, ulong raid_chunksize,
+ myf MyFlags);
+  File my_raid_open(const char *FileName, int Flags,
+   uint raid_type, uint raid_chunks, ulong raid_chunksize,
+   myf MyFlags);
+  int my_raid_rename(const char *from, const char *to, uint raid_chunks,
+myf MyFlags);
+  int my_raid_delete(const char *from, uint raid_chunks, myf MyFlags);
+  int my_raid_redel(const char *old_name, const char *new_name,
+   uint raid_chunks, myf MyFlags);
+
+  my_off_t my_raid_seek(File fd, my_off_t pos, int whence, myf MyFlags);
+  my_off_t my_raid_tell(File fd, myf MyFlags);
+
+  uint my_raid_write(File,const byte *Buffer, uint Count, myf MyFlags);
+  uint my_raid_read(File Filedes, byte *Buffer, uint Count, myf MyFlags);
+
+  uint my_raid_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
+myf MyFlags);
+  uint my_raid_pwrite(int Filedes, const byte *Buffer, uint Count,
+ my_off_t offset, myf MyFlags);
+
+  int my_raid_lock(File,int locktype, my_off_t start, my_off_t length,
+  myf MyFlags);
+  int my_raid_chsize(File fd, my_off_t newlength, myf MyFlags);
+  int my_raid_close(File, myf MyFlags);
+  int my_raid_fstat(int Filedes, struct stat *buf,  myf MyFlags);
+
+#ifdef __cplusplus
+}
+
+

[PHP-CVS] cvs: php4 /ext/mysql/libmysql config-win.h update_sources

2001-01-24 Thread MySQL Team

mysql   Wed Jan 24 10:11:25 2001 EDT

  Modified files:  
/php4/ext/mysql/libmysqlconfig-win.h update_sources 
  Log:
  Don't #define HAVE_COMPRESS on windows.
  
  
Index: php4/ext/mysql/libmysql/config-win.h
diff -u php4/ext/mysql/libmysql/config-win.h:1.5 
php4/ext/mysql/libmysql/config-win.h:1.6
--- php4/ext/mysql/libmysql/config-win.h:1.5Tue Jan 23 08:48:49 2001
+++ php4/ext/mysql/libmysql/config-win.hWed Jan 24 10:11:25 2001
@@ -239,7 +239,7 @@
 #define HAVE_ALLOCA
 #define HAVE_STRPBRK
 #define HAVE_STRSTR
-#define HAVE_COMPRESS
+/* #define HAVE_COMPRESS -- not with PHP, please */
 
 #ifdef NOT_USED
 #define HAVE_SNPRINTF  /* Gave link error */
Index: php4/ext/mysql/libmysql/update_sources
diff -u php4/ext/mysql/libmysql/update_sources:1.1 
php4/ext/mysql/libmysql/update_sources:1.2
--- php4/ext/mysql/libmysql/update_sources:1.1  Tue Jan 23 08:48:50 2001
+++ php4/ext/mysql/libmysql/update_sources  Wed Jan 24 10:11:25 2001
@@ -89,6 +89,8 @@
 else
 {
   print STDERR "DIFF: $f\n";
+  $f eq 'config-win.h' and
+   print STDERR "/n/nDon't forget to undefine HAVE_COMPRESS in $f/n/n/n";
 }
   }
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]