From 1b9b2c3091fc580bff82ca0630221eabd5628d6c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Feb 2003 22:07:26 +0200 Subject: client port number added to SHOW PROCESSLIST (SCRUM?) include/violite.h: port added to reported parameters libmysqld/lib_vio.c: port added to reported parameters sql/sql_class.h: port added to reported parameters sql/sql_parse.cc: port added to reported parameters sql/sql_show.cc: SHOW PROCESSLIST will report port number if it is possible vio/viosocket.c: port added to reported parameters --- include/violite.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/violite.h b/include/violite.h index 6c8ad1f4b69..f99bb521e23 100644 --- a/include/violite.h +++ b/include/violite.h @@ -95,7 +95,7 @@ my_socket vio_fd(Vio*vio); /* * Remote peer's address and name in text form. */ -my_bool vio_peer_addr(Vio* vio, char *buf); +my_bool vio_peer_addr(Vio* vio, char *buf, u_int16_t *port); /* Remotes in_addr */ @@ -119,7 +119,7 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #define vio_keepalive(vio, set_keep_alive) (vio)->viokeepalive(vio, set_keep_alive) #define vio_should_retry(vio) (vio)->should_retry(vio) #define vio_close(vio) ((vio)->vioclose)(vio) -#define vio_peer_addr(vio, buf) (vio)->peer_addr(vio, buf) +#define vio_peer_addr(vio, buf, prt) (vio)->peer_addr(vio, buf, prt) #define vio_in_addr(vio, in) (vio)->in_addr(vio, in) #endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */ -- cgit v1.2.1 From 828d7c6ec2fcd3a124dc043d7c19472106a11721 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Feb 2003 21:29:56 +0200 Subject: postmerging fix (SCRUM) include/violite.h: postmerging fix libmysqld/lib_vio.c: postmerging fix --- include/violite.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/violite.h b/include/violite.h index f99bb521e23..a328e51253a 100644 --- a/include/violite.h +++ b/include/violite.h @@ -95,7 +95,7 @@ my_socket vio_fd(Vio*vio); /* * Remote peer's address and name in text form. */ -my_bool vio_peer_addr(Vio* vio, char *buf, u_int16_t *port); +my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); /* Remotes in_addr */ @@ -224,7 +224,7 @@ struct st_vio my_bool (*is_blocking)(Vio*); int (*viokeepalive)(Vio*, my_bool); int (*fastsend)(Vio*); - my_bool (*peer_addr)(Vio*, gptr); + my_bool (*peer_addr)(Vio*, gptr, uint16*); void (*in_addr)(Vio*, struct in_addr*); my_bool (*should_retry)(Vio*); int (*vioclose)(Vio*); -- cgit v1.2.1 From 391bc11a2121919a29a2579639bc476b6c25fa6a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Feb 2003 19:52:14 +0200 Subject: Always include errno.h include/global.h: Portability fix (Using errno before including errno.h can give big problems on Linux) --- include/global.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index 988797b330c..1737c60db30 100644 --- a/include/global.h +++ b/include/global.h @@ -223,6 +223,7 @@ double my_ulonglong2double(unsigned long long A); #define CONFIG_SMP #include #endif +#include /* Recommended by debian */ /* Go around some bugs in different OS and compilers */ #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) -- cgit v1.2.1 From b276b60e033744a25b034d3107e7a3f1122e04c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Feb 2003 22:24:00 +0200 Subject: LOAD DATA INFILE is not replicated if replicate_*_table is set LOAD DATA LOCAL INFILE was not replicated correctly VC++Files/bdb/bdb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/Berkeley_DB.dsw: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_archive.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_buildall.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_checkpoint.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_deadlock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dll.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dump.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_java.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_load.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_printlog.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_recover.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_stat.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static1.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_tcl.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_test.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_upgrade.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_verify.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_tpcb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_tpcb.dsp: Updated VC++ files +end space removed VC++Files/client/mysql.dsp: Updated VC++ files +end space removed VC++Files/client/mysqladmin.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsw: Updated VC++ files +end space removed VC++Files/client/mysqldump.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlimport.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlshow.dsp: Updated VC++ files +end space removed VC++Files/comp_err/comp_err.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsp: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsw: Updated VC++ files +end space removed VC++Files/heap/heap.dsp: Updated VC++ files +end space removed VC++Files/innobase/innobase.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsw: Updated VC++ files +end space removed VC++Files/isamchk/isamchk.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsw: Updated VC++ files +end space removed VC++Files/libmysqld/examples/test_libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqld/libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/myTest.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/mytest.dsw: Updated VC++ files +end space removed VC++Files/merge/merge.dsp: Updated VC++ files +end space removed VC++Files/merge/merge.dsw: Updated VC++ files +end space removed VC++Files/my_print_defaults/my_print_defaults.dsp: Updated VC++ files +end space removed VC++Files/myisam/myisam.dsp: Updated VC++ files +end space removed VC++Files/myisamchk/myisamchk.dsp: Updated VC++ files +end space removed VC++Files/myisamlog/myisamlog.dsp: Updated VC++ files +end space removed VC++Files/myisammrg/myisammrg.dsp: Updated VC++ files +end space removed VC++Files/myisampack/myisampack.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsw: Updated VC++ files +end space removed VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated VC++ files +end space removed VC++Files/mysqlcheck/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/mysqldemb/mysqldemb.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/MySqlManager.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/mysqlmanager.dsw: Updated VC++ files +end space removed VC++Files/mysqlserver/mysqlserver.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/myshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/mysqlshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlwatch/mysqlwatch.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsw: Updated VC++ files +end space removed VC++Files/pack_isam/pack_isam.dsp: Updated VC++ files +end space removed VC++Files/perror/perror.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsw: Updated VC++ files +end space removed VC++Files/replace/replace.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsw: Updated VC++ files +end space removed VC++Files/sql/mysqldmax.dsp: Updated VC++ files +end space removed VC++Files/sql/old/mysqld.dsw: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/strings.dsw: Updated VC++ files +end space removed VC++Files/test1/test1.dsp: Updated VC++ files +end space removed VC++Files/thr_insert_test/thr_insert_test.dsp: Updated VC++ files +end space removed VC++Files/thr_test/thr_test.dsp: Updated VC++ files +end space removed VC++Files/vio/vio.dsp: Updated VC++ files +end space removed VC++Files/zlib/zlib.dsp: Updated VC++ files +end space removed include/my_global.h: Always include errno.h sql/log_event.cc: LOAD DATA INFILE is not replicated if replicate_*_table is set sql/mf_iocache.cc: LOAD DATA LOCAL INFILE was not replicated correctly --- include/my_global.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/my_global.h b/include/my_global.h index f98cc48ba20..49ca0e03f89 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -261,6 +261,7 @@ C_MODE_END #define CONFIG_SMP #include #endif +#include /* Recommended by debian */ /* Go around some bugs in different OS and compilers */ #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) -- cgit v1.2.1 From 6a933b2e08037a4fb17ea98abf00d0990cef22ae Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Mar 2003 01:48:57 +0100 Subject: fix auto-increment in sub-key and insert ... select --- include/myisam.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/myisam.h b/include/myisam.h index 94b5d23bba6..def8b492681 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -100,6 +100,7 @@ typedef struct st_mi_create_info ulong raid_chunksize; uint old_options; uint8 language; + my_bool with_auto_increment; } MI_CREATE_INFO; struct st_myisam_info; /* For referense */ -- cgit v1.2.1 From 3446199d8e421da02a5546f439ee76b368594700 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Mar 2003 12:22:35 +0200 Subject: Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped client/mysqltest.c: Fixed bug that comments did a ping include/thr_lock.h: Added function to abort a lock for a specific thread mysql-test/mysql-test-run.sh: Fixed where mysqltest traces are put mysql-test/r/lock_multi.result: Test for LOCK TABLE + DROP TABLE bug mysql-test/t/lock_multi.test: Test for LOCK TABLE + DROP TABLE bug mysys/thr_lock.c: Added function to abort a lock for a specific thread sql/handler.cc: Indentation cleanup sql/lock.cc: Added function to abort a lock for a specific thread sql/mysql_priv.h: Added function to abort a lock for a specific thread sql/mysqld.cc: Use automatic recover even with --safe --- include/thr_lock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/thr_lock.h b/include/thr_lock.h index 6650d25e145..f1bda0ce6b4 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -107,6 +107,7 @@ void thr_unlock(THR_LOCK_DATA *data); int thr_multi_lock(THR_LOCK_DATA **data,uint count); void thr_multi_unlock(THR_LOCK_DATA **data,uint count); void thr_abort_locks(THR_LOCK *lock); +void thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread); void thr_print_locks(void); /* For debugging */ my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data); my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data); -- cgit v1.2.1 From 121d4f478fd559d8b9b4b2abb89a66e3f90c51aa Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Mar 2003 13:10:23 +0100 Subject: my_dir.h is included by raid.h --- include/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/Makefile.am b/include/Makefile.am index 7a02b38020d..cb6da7bbb3a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,12 +20,12 @@ pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ errmsg.h my_global.h my_net.h my_alloc.h \ - my_getopt.h sslopt-longopts.h \ + my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h $(BUILT_SOURCES) noinst_HEADERS = config-win.h config-os2.h config-netware.h \ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ - my_dir.h mysys_err.h my_base.h \ + mysys_err.h my_base.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ my_aes.h my_tree.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in -- cgit v1.2.1 From 68ae365395c78eba74b4db66fb0989e76d221d0d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 10 Mar 2003 11:22:37 +0200 Subject: Don't allow BACKUP TABLE to overwrite files Fixed memory leak when replication restarts in debug mode include/my_sys.h: Added option to not overwrite files to my_copy() mysql-test/mysql-test-run.sh: Fixed --ddd option Fixed that mysqld is restarted if there is a testname-master.sh file mysql-test/r/backup.result: Update for security fix in BACKUP TABLE mysql-test/t/backup.test: Update for security fix in BACKUP TABLE mysys/my_copy.c: Added option to not overwrite files to my_copy() sql/ha_myisam.cc: Don't allow BACKUP TABLE to overwrite files sql/slave.cc: Fixed problem with --debug output from 'handle_slave' Fixed memory leak when replication restarts in debug mode --- include/my_sys.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/my_sys.h b/include/my_sys.h index cd6ec62719a..924a6094416 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -73,6 +73,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_FREE_ON_ERROR 128 /* my_realloc() ; Free old ptr on error */ #define MY_HOLD_ON_ERROR 256 /* my_realloc() ; Return old ptr on error */ #define MY_THREADSAFE 128 /* pread/pwrite: Don't allow interrupts */ +#define MY_DONT_OVERWRITE_FILE 1024 /* my_copy; Don't overwrite file */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ -- cgit v1.2.1