From 428cdb5124dae5923fe58da866dde2ce9575f1d0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jan 2007 22:40:30 +0100 Subject: [PATCH 1/8] mysql.spec.sh: Added man page mysql_install_db.1 support-files/mysql.spec.sh: Added man page mysql_install_db.1 --- support-files/mysql.spec.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 02176ea0b41..a9f8d574de9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -559,6 +559,7 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* From 5c1f67d31223ca769345eee7209796c552caae27 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Feb 2007 13:03:37 +0200 Subject: [PATCH 2/8] Fixes a compilation problem on Windows. Backport of the same fix from 4.0. --- sql/mysqld.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 43d76f28007..59ea766b5c8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2251,7 +2251,11 @@ int main(int argc, char **argv) #endif /* Set signal used to kill MySQL */ +#if defined(SIGUSR2) thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; +#else + thr_kill_signal= SIGINT; +#endif /* Init mutexes for the global MYSQL_LOG objects. From 2a221c8014dd91fa80bbadc71c83f39e6d5704b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Feb 2007 15:03:11 +0100 Subject: [PATCH 3/8] Compile error on Windows: Signal names are undefined. Fix by hiding the whole section. mysys/my_thr_init.c: Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined. Fix by hiding the whole section, according to Jani it is not needed on Windows. --- mysys/my_thr_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 5729f27b7a7..f4fd96b769d 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -60,11 +60,14 @@ static uint get_thread_lib(void); my_bool my_thread_global_init(void) { +#if defined(SIGALRM) || defined(SIGUSR1) + /* On Windows, these signals are not defined, but this whole part is not needed. */ thd_lib_detected= get_thread_lib(); if (thd_lib_detected == THD_LIB_LT) thr_client_alarm= SIGALRM; else thr_client_alarm= SIGUSR1; +#endif if (pthread_key_create(&THR_KEY_mysys,0)) { From 2d2957c041708548a422d4e64bf2d3cc10051cf8 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Feb 2007 19:55:33 +0100 Subject: [PATCH 4/8] Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c". mysys/my_pthread.c: Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there. --- mysys/my_pthread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index fd716448e43..19766a2d195 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -32,7 +32,6 @@ #endif uint thd_lib_detected; -uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) From 715281a94bf2e215f85e3074ffe2131dba311f88 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Feb 2007 20:13:34 +0100 Subject: [PATCH 5/8] Fix a linkage problem with the previous patch for "thr_client_alarm". mysys/my_pthread.c: Linkage problem with previous patch: "thr_client_alarm" must be declared in here. mysys/thr_alarm.c: Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c". --- mysys/my_pthread.c | 1 + mysys/thr_alarm.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 19766a2d195..fd716448e43 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -32,6 +32,7 @@ #endif uint thd_lib_detected; +uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 8f342e269de..c8e1e55aac2 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -37,7 +37,6 @@ #define ETIME ETIMEDOUT #endif -uint thr_client_alarm; static int alarm_aborted=1; /* No alarm thread */ my_bool thr_alarm_inited= 0; volatile my_bool alarm_thread_running= 0; From 6f21a5af6bec093063e803aaf4f1cd8ca1fa618c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 16 Feb 2007 16:31:31 +0100 Subject: [PATCH 6/8] include/config-win.h : Companion change to this one ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0 include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10 which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ... include/config-win.h: Companion change to this one ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0 include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10 which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ... --- include/config-win.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config-win.h b/include/config-win.h index 42aa23c3afe..3adb940aa4f 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -167,7 +167,7 @@ typedef uint rf_SetTimer; /* Convert some simple functions to Posix */ -#define sigset(A,B) signal((A),(B)) +#define my_sigset(A,B) signal((A),(B)) #define finite(A) _finite(A) #define sleep(A) Sleep((A)*1000) From cf933534eac84b998de0853ff809f828405b7e00 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Feb 2007 13:10:27 +0100 Subject: [PATCH 7/8] After-merge fix: The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c". mysys/thr_alarm.c: After-merge fix: In 4.1, the variable "thr_client_alarm" is declared in this module. --- mysys/thr_alarm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 7ccc1dc5d2f..759544af17b 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -36,6 +36,7 @@ #define ETIME ETIMEDOUT #endif +uint thr_client_alarm; static int alarm_aborted=1; /* No alarm thread */ my_bool thr_alarm_inited= 0; volatile my_bool alarm_thread_running= 0; From da39e1d848cd5851accc9a0b348d482c574c380b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Feb 2007 16:50:54 +0100 Subject: [PATCH 8/8] Raise version number after cloning 5.0.36 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index a447732a06a..d48c3403954 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.36) +AM_INIT_AUTOMAKE(mysql, 5.0.38) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=36 +NDB_VERSION_BUILD=38 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ?