From c6f0c29acbd77a6b12f58775a68701913b3ce094 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 22 Nov 2007 17:48:40 +0100 Subject: [PATCH 1/7] Makefile.am, configure.in: Include "manual.chm" in source TAR if it exists configure.in: Include "manual.chm" in source TAR if it exists Docs/Makefile.am: Include "manual.chm" in source TAR if it exists --- Docs/Makefile.am | 2 +- configure.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Makefile.am b/Docs/Makefile.am index dac256f8fd6..629618609a3 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -13,7 +13,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -EXTRA_DIST = mysql.info INSTALL-BINARY +EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ # make sure that "make install" installs the info page, too # automake only seems to take care of this automatically, diff --git a/configure.in b/configure.in index e042bb80719..ead2f85afb7 100644 --- a/configure.in +++ b/configure.in @@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs, if test "$with_docs" = "yes" then docs_dirs="Docs" + if test -f "$srcdir/Docs/manual.chm" ; then + extra_docs="manual.chm" + fi else docs_dirs="" + extra_docs="" fi AC_SUBST(docs_dirs) +AC_SUBST(extra_docs) # Shall we build the man pages? AC_ARG_WITH(man, From 77f59b989cacc3aa4147047f5b8ffdd1a3c8c98d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 26 Nov 2007 21:28:01 +0100 Subject: [PATCH 2/7] patch for bug#32496 (2nd) with ansi conformant and Mysql test case. BitKeeper/etc/ignore: Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list --- .bzrignore | 2 ++ mysql-test/suite/funcs_1/r/innodb_views.result | 15 +++++++++++---- mysql-test/suite/funcs_1/r/memory_views.result | 15 +++++++++++---- mysql-test/suite/funcs_1/r/myisam_views.result | 15 +++++++++++---- mysql-test/suite/funcs_1/views/views_master.inc | 9 +++++++++ 5 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.bzrignore b/.bzrignore index 9b90cd97d84..2b5b42cb87f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1351,3 +1351,5 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +scripts/make_win_src_distribution_old +server-tools/instance-manager/net_serv.cc diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index 3bb56a82612..7f94f266102 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -9836,16 +9836,23 @@ f2 two SET sql_mode = 'traditional,ansi'; CREATE OR REPLACE VIEW v1 AS +SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =", +3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):", +'->' || CAST(f3 AS CHAR) || '<-' + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" +FROM t1 WHERE f1 = 2; +CREATE OR REPLACE VIEW v1 AS SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", '->' || CAST(f3 AS CHAR) || '<-' AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " FROM t1 WHERE f1 = 2; +ERROR 42000: Incorrect column name 'pure column f3: ' SELECT * FROM v1; -pure column f3: 2.20000 -sum of columns f1 + f3 = 4.20000 -product of constants 3 * (- 0.11111E+1): -3.3333 -expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- +pure column f3: 2.20000 +sum of columns f1 + f3 = 4.20000 +product of constants 3 * (- 0.11111E+1): -3.3333 +expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- SET sql_mode = ''; Testcases 3.3.1.55 - 3.3.1.62 diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result index 69dee081446..5fae2f8700a 100644 --- a/mysql-test/suite/funcs_1/r/memory_views.result +++ b/mysql-test/suite/funcs_1/r/memory_views.result @@ -9841,16 +9841,23 @@ f2 two SET sql_mode = 'traditional,ansi'; CREATE OR REPLACE VIEW v1 AS +SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =", +3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):", +'->' || CAST(f3 AS CHAR) || '<-' + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" +FROM t1 WHERE f1 = 2; +CREATE OR REPLACE VIEW v1 AS SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", '->' || CAST(f3 AS CHAR) || '<-' AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " FROM t1 WHERE f1 = 2; +ERROR 42000: Incorrect column name 'pure column f3: ' SELECT * FROM v1; -pure column f3: 2.20000 -sum of columns f1 + f3 = 4.20000 -product of constants 3 * (- 0.11111E+1): -3.3333 -expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- +pure column f3: 2.20000 +sum of columns f1 + f3 = 4.20000 +product of constants 3 * (- 0.11111E+1): -3.3333 +expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- SET sql_mode = ''; Testcases 3.3.1.55 - 3.3.1.62 diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result index 83af04dcd2c..6f80aa12097 100644 --- a/mysql-test/suite/funcs_1/r/myisam_views.result +++ b/mysql-test/suite/funcs_1/r/myisam_views.result @@ -9858,16 +9858,23 @@ f2 two SET sql_mode = 'traditional,ansi'; CREATE OR REPLACE VIEW v1 AS +SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =", +3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):", +'->' || CAST(f3 AS CHAR) || '<-' + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" +FROM t1 WHERE f1 = 2; +CREATE OR REPLACE VIEW v1 AS SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", '->' || CAST(f3 AS CHAR) || '<-' AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " FROM t1 WHERE f1 = 2; +ERROR 42000: Incorrect column name 'pure column f3: ' SELECT * FROM v1; -pure column f3: 2.20000 -sum of columns f1 + f3 = 4.20000 -product of constants 3 * (- 0.11111E+1): -3.3333 -expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- +pure column f3: 2.20000 +sum of columns f1 + f3 = 4.20000 +product of constants 3 * (- 0.11111E+1): -3.3333 +expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- SET sql_mode = ''; Testcases 3.3.1.55 - 3.3.1.62 diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc index b06873af159..6c4992d235c 100644 --- a/mysql-test/suite/funcs_1/views/views_master.inc +++ b/mysql-test/suite/funcs_1/views/views_master.inc @@ -2410,6 +2410,15 @@ SELECT * FROM v1; # 3.3.1.54 --vertical_results SET sql_mode = 'traditional,ansi'; +# due to bug#32496 "no trailing blanks in identifier". +CREATE OR REPLACE VIEW v1 AS +SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =", + 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):", + '->' || CAST(f3 AS CHAR) || '<-' + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" +FROM t1 WHERE f1 = 2; +# This error is not conformant with ansi (see bug#32496). hhunger +--error ER_WRONG_COLUMN_NAME CREATE OR REPLACE VIEW v1 AS SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", From 854d0fa1764be8422d4ebe7183cc09b2985d492b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Nov 2007 16:40:46 +0000 Subject: [PATCH 3/7] Shell portability fix. scripts/mysql_install_db.sh: Use "test !" instead of "! test", as the latter does not work on certain shells. --- scripts/mysql_install_db.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 5716d4f51c0..257deed3d28 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -181,14 +181,14 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@" if test -n "$basedir" then print_defaults=`find_in_basedir my_print_defaults bin extra` - if ! test -x "$print_defaults" + if test ! -x "$print_defaults" then missing_in_basedir my_print_defaults exit 1 fi else print_defaults="@bindir@/my_print_defaults" - if ! test -x "$print_defaults" + if test ! -x "$print_defaults" then echo "FATAL ERROR: Could not find $print_defaults" echo @@ -223,7 +223,7 @@ else exit 1 fi mysqld=`find_in_basedir mysqld libexec sbin bin` - if ! test -x "$mysqld" + if test ! -x "$mysqld" then missing_in_basedir mysqld exit 1 From f177f5f9a5a0416f06dcf5e95ef58dcfe3edb043 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Nov 2007 23:42:04 +0100 Subject: [PATCH 4/7] my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries include/my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries --- include/my_global.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/my_global.h b/include/my_global.h index 5e31a66e5e3..7bd82533575 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -95,9 +95,9 @@ # undef SIZEOF_LONG_LONG # undef SIZEOF_OFF_T # undef SIZEOF_SHORT +# undef WORDS_BIGENDIAN #if defined(__i386__) -# undef WORDS_BIGENDIAN # define SIZEOF_CHARP 4 # define SIZEOF_INT 4 # define SIZEOF_LONG 4 @@ -114,6 +114,23 @@ # define SIZEOF_OFF_T 8 # define SIZEOF_SHORT 2 +#if defined(__x86_64__) +# define SIZEOF_CHARP 8 +# define SIZEOF_INT 4 +# define SIZEOF_LONG 8 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_OFF_T 8 +# define SIZEOF_SHORT 2 + +#elif defined(__ppc64__) +# define WORDS_BIGENDIAN +# define SIZEOF_CHARP 8 +# define SIZEOF_INT 4 +# define SIZEOF_LONG 8 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_OFF_T 8 +# define SIZEOF_SHORT 2 + #else # error Building FAT binary for an unknown architecture. #endif From 61f57730a8bb64e607e42d74fac76f6cd8b3b021 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 01:22:15 +0100 Subject: [PATCH 5/7] Excluded verbose and bad change to Mac OS X universal binaries handling --- include/my_global.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index 7bd82533575..5e31a66e5e3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -95,9 +95,9 @@ # undef SIZEOF_LONG_LONG # undef SIZEOF_OFF_T # undef SIZEOF_SHORT -# undef WORDS_BIGENDIAN #if defined(__i386__) +# undef WORDS_BIGENDIAN # define SIZEOF_CHARP 4 # define SIZEOF_INT 4 # define SIZEOF_LONG 4 @@ -114,23 +114,6 @@ # define SIZEOF_OFF_T 8 # define SIZEOF_SHORT 2 -#if defined(__x86_64__) -# define SIZEOF_CHARP 8 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 8 -# define SIZEOF_LONG_LONG 8 -# define SIZEOF_OFF_T 8 -# define SIZEOF_SHORT 2 - -#elif defined(__ppc64__) -# define WORDS_BIGENDIAN -# define SIZEOF_CHARP 8 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 8 -# define SIZEOF_LONG_LONG 8 -# define SIZEOF_OFF_T 8 -# define SIZEOF_SHORT 2 - #else # error Building FAT binary for an unknown architecture. #endif From 44ebdc095a5577ef4dabd2b0c39c5f2a7d4c12d1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 01:36:05 +0100 Subject: [PATCH 6/7] my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries include/my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries --- include/my_global.h | 55 +++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index 5e31a66e5e3..ebc725c300d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -88,36 +88,31 @@ The macros below are used to allow build of Universal/fat binaries of MySQL and MySQL applications under darwin. */ -#ifdef TARGET_FAT_BINARY -# undef SIZEOF_CHARP -# undef SIZEOF_INT -# undef SIZEOF_LONG -# undef SIZEOF_LONG_LONG -# undef SIZEOF_OFF_T -# undef SIZEOF_SHORT - -#if defined(__i386__) -# undef WORDS_BIGENDIAN -# define SIZEOF_CHARP 4 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 4 -# define SIZEOF_LONG_LONG 8 -# define SIZEOF_OFF_T 8 -# define SIZEOF_SHORT 2 - -#elif defined(__ppc__) -# define WORDS_BIGENDIAN -# define SIZEOF_CHARP 4 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 4 -# define SIZEOF_LONG_LONG 8 -# define SIZEOF_OFF_T 8 -# define SIZEOF_SHORT 2 - -#else -# error Building FAT binary for an unknown architecture. -#endif -#endif /* TARGET_FAT_BINARY */ +#if defined(__APPLE__) && defined(__MACH__) +# undef SIZEOF_CHARP +# undef SIZEOF_SHORT +# undef SIZEOF_INT +# undef SIZEOF_LONG +# undef SIZEOF_LONG_LONG +# undef SIZEOF_OFF_T +# undef WORDS_BIGENDIAN +# define SIZEOF_SHORT 2 +# define SIZEOF_INT 4 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_OFF_T 8 +# if defined(__i386__) || defined(__ppc__) +# define SIZEOF_CHARP 4 +# define SIZEOF_LONG 4 +# elif defined(__x86_64__) || defined(__ppc64__) +# define SIZEOF_CHARP 8 +# define SIZEOF_LONG 8 +# else +# error Building FAT binary for an unknown architecture. +# endif +# if defined(__ppc__) || defined(__ppc64__) +# define WORDS_BIGENDIAN +# endif +#endif /* defined(__APPLE__) && defined(__MACH__) */ /* From 56b009412d3c82dacd9e63bdcd9adf8e54aebb35 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 18:06:28 +0100 Subject: [PATCH 7/7] Fix for Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306 Note: This bug does not occur in MySQL 5.0 and up, because ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this. The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT which is set by mysql-test-run.pl. mysql-test-run.pl in 4.1 does not set this variable. There are two alternatives: 1) Backport the 5.0 fix for this test including modifications to mysql-test-run.pl and mysql-test-run-shell. This is a not acceptable impact on an old MySQL version. 2) Fix the problem different than in 5.0 like in the current ChangeSet + do not apply these changes when upmerging to 5.0 mysql-test/r/rpl000015.result: Updated result mysql-test/t/disabled.def: Enable rpl000015 mysql-test/t/rpl000015.test: Unify the MASTER_PORT number --- mysql-test/r/rpl000015.result | 2 +- mysql-test/t/disabled.def | 1 - mysql-test/t/rpl000015.test | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index b3e6ef71e45..64172b4ade9 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -8,7 +8,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File change master to master_host='127.0.0.1'; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 test MASTER_PORT 7 4 # # No No 0 0 0 # None 0 No # +# 127.0.0.1 test # 7 4 # # No No 0 0 0 # None 0 No # change master to master_host='127.0.0.1',master_user='root', master_password='',master_port=MASTER_PORT; show slave status; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 80b28e11da6..9bfe9567d83 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -10,4 +10,3 @@ # ############################################################################## -rpl000015 : Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306 diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index a23a4b0ba5f..6f43e4525df 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -13,7 +13,7 @@ show slave status; change master to master_host='127.0.0.1'; # The following needs to be cleaned up when change master is fixed --replace_result $MASTER_MYPORT MASTER_PORT $MYSQL_TCP_PORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 4 # 8 # 9 # 23 # 33 # show slave status; --replace_result $MASTER_MYPORT MASTER_PORT eval change master to master_host='127.0.0.1',master_user='root',