From 8deafa8037b289d089ffeb8d6bdaee812113a9b0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Jan 2005 14:30:38 -0800 Subject: [PATCH 1/8] order_by.result, order_by.test: Added a test case for bug #7672. sql_yacc.yy: Fixed bug #7672. Made queries of the form (SELECT ...) ORDER BY ... to be equivalent to SELECT ... ORDER BY ... sql/sql_yacc.yy: Fixed bug #7672. Made queries of the form (SELECT ...) ORDER BY ... to be equivalent to SELECT ... ORDER BY ... mysql-test/t/order_by.test: Added a test case for bug #7672. mysql-test/r/order_by.result: Added a test case for bug #7672. --- mysql-test/r/order_by.result | 17 +++++++++++++++++ mysql-test/t/order_by.test | 13 ++++++++++++- sql/sql_yacc.yy | 13 ++++++++----- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 859d9d4cab0..4ea638dbc19 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -554,3 +554,20 @@ explain select id,t from t1 force index (primary) order by id; table type possible_keys key key_len ref rows Extra t1 index NULL PRIMARY 4 NULL 1000 drop table t1; +CREATE TABLE t1 (a int); +INSERT INTO t1 VALUES (2), (1), (1), (2), (1); +SELECT a FROM t1 ORDER BY a; +a +1 +1 +1 +2 +2 +(SELECT a FROM t1) ORDER BY a; +a +1 +1 +1 +2 +2 +DROP TABLE t1; diff --git a/mysql-test/t/order_by.test b/mysql-test/t/order_by.test index 86ecc4aa70d..d65b2c257a1 100644 --- a/mysql-test/t/order_by.test +++ b/mysql-test/t/order_by.test @@ -363,4 +363,15 @@ while ($1) enable_query_log; explain select id,t from t1 order by id; explain select id,t from t1 force index (primary) order by id; -drop table t1; \ No newline at end of file +drop table t1; + +# +# Bug #7672 - a wrong result for a select query in braces followed by order by +# + +CREATE TABLE t1 (a int); +INSERT INTO t1 VALUES (2), (1), (1), (2), (1); +SELECT a FROM t1 ORDER BY a; +(SELECT a FROM t1) ORDER BY a; +DROP TABLE t1; + diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 7b72c73a915..6d0237f5615 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4033,11 +4033,14 @@ optional_order_or_limit: send_error(&lex->thd->net, ER_SYNTAX_ERROR); YYABORT; } - if (mysql_new_select(lex)) - YYABORT; - mysql_init_select(lex); - lex->select->linkage=NOT_A_SELECT; - lex->select->select_limit=lex->thd->variables.select_limit; + if (lex->select != &lex->select_lex) + { + if (mysql_new_select(lex)) + YYABORT; + mysql_init_select(lex); + lex->select->linkage=NOT_A_SELECT; + lex->select->select_limit=lex->thd->variables.select_limit; + } } opt_order_clause limit_clause ; From b8cac714940514879ab3e61eb0d2ee473de9d5dc Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Jan 2005 14:48:26 -0600 Subject: [PATCH 2/8] Bug #5185 mysqldump for windows database gets table names with different case Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'. This will get the table name in the proper case. We use this table name rather than the one given on the command line. This will prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be an issue. mysqldump.c: call get_actual_table_name to get the table name in the proper case client/mysqldump.c: call get_actual_table_name to get the table name in the proper case --- client/mysqldump.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 00f5272e3d7..db86a3714c1 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2082,6 +2082,34 @@ static int dump_all_tables_in_db(char *database) } /* dump_all_tables_in_db */ +/* + get_actual_table_name -- executes a SHOW TABLES LIKE '%s' to get the actual table name + from the server for the table name given on the command line. we do this because + the table name given on the command line may be a different case (e.g. T1 vs t1) + + RETURN + void +*/ +static void get_actual_table_name( const char *old_table_name, char *new_table_name, int buf_size ) +{ + MYSQL_RES *tableRes; + MYSQL_ROW row; + char query[ NAME_LEN*2+3 + 50 ]; + + DBUG_ENTER("get_actual_table_name"); + + sprintf( query, "SHOW TABLES LIKE '%s'", old_table_name ); + if (mysql_query_with_error_report(sock, 0, query)) + { + safe_exit(EX_MYSQLERR); + } + + tableRes = mysql_store_result( sock ); + row = mysql_fetch_row( tableRes ); + strncpy( new_table_name, row[0], buf_size ); + mysql_free_result(tableRes); +} /* get_actual_table_name */ + static int dump_selected_tables(char *db, char **table_names, int tables) { @@ -2116,9 +2144,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables) print_xml_tag1(md_result_file, "", "database name=", db, "\n"); for (; tables > 0 ; tables-- , table_names++) { - numrows = getTableStructure(*table_names, db); + char new_table_name[NAME_LEN*+3]; + + /* the table name passed on commandline may be wrong case */ + get_actual_table_name( *table_names, new_table_name, sizeof(new_table_name) ); + + numrows = getTableStructure(new_table_name, db); if (!dFlag && numrows > 0) - dumpTable(numrows, *table_names); + dumpTable(numrows, new_table_name); my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); order_by= 0; } From 085f70728768abc2f25ad46a329a6659c17088bc Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Jan 2005 13:49:42 +0100 Subject: [PATCH 3/8] fixed automake problem in dbug/Makefile.am --- dbug/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dbug/Makefile.am b/dbug/Makefile.am index f8ddf0e6567..a951aff6094 100644 --- a/dbug/Makefile.am +++ b/dbug/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = example1.c example2.c example3.c \ NROFF_INC = example1.r example2.r example3.r main.r \ factorial.r output1.r output2.r output3.r \ output4.r output5.r +CLEANFILES = $(NROFF_INC) user.t user.ps # Must be linked with libs that are not compiled yet @@ -59,8 +60,5 @@ output5.r: factorial @RM@ -f $@ @SED@ -e 's!\\!\\\\!g' $< > $@ -clean: - @RM@ -f $(NROFF_INC) user.t user.ps - # Don't update the files from bitkeeper %::SCCS/s.% From 5c3c40798dce878bd6561b8da6a5e1cbd9f16279 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Jan 2005 17:14:03 +0100 Subject: [PATCH 4/8] small Makefile.am cleanup clean: targets removed generated *.h files moved to include/ Docs/Images/Makefile.am: no clean: targets please! client/Makefile.am: generated *.h files moved to include/ extra/Makefile.am: generated *.h files moved to include/ include/Makefile.am: no clean: targets please! libmysql/Makefile.am: generated *.h files moved to include/ libmysql_r/Makefile.am: generated *.h files moved to include/ libmysqld/Makefile.am: generated *.h files moved to include/ libmysqld/examples/Makefile.am: generated *.h files moved to include/ no clean: target please! ndb/docs/Makefile.am: no clean: targets please! scripts/Makefile.am: SUPERCLEANFILES means nothing server-tools/instance-manager/Makefile.am: generated *.h files moved to include/ sql/Makefile.am: generated *.h files moved to include/ sql/share/Makefile.am: instead of (incorrectly) duplicating comp_err command line, call do make in extra/ tools/Makefile.am: generated *.h files moved to include/ BitKeeper/etc/ignore: Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list --- .bzrignore | 3 +++ Docs/Images/Makefile.am | 4 ---- client/Makefile.am | 2 +- extra/Makefile.am | 29 ++++++++++++----------- include/Makefile.am | 9 ++----- libmysql/Makefile.am | 2 +- libmysql_r/Makefile.am | 2 +- libmysqld/Makefile.am | 2 +- libmysqld/examples/Makefile.am | 15 +++++------- ndb/docs/Makefile.am | 2 +- scripts/Makefile.am | 2 +- server-tools/instance-manager/Makefile.am | 2 +- sql/Makefile.am | 6 ++--- sql/share/Makefile.am | 5 ++-- tools/Makefile.am | 2 +- 15 files changed, 39 insertions(+), 48 deletions(-) diff --git a/.bzrignore b/.bzrignore index 8a947d63b75..bb1cdb1c0c3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1052,3 +1052,6 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +include/mysqld_ername.h +include/mysqld_error.h +include/sql_state.h diff --git a/Docs/Images/Makefile.am b/Docs/Images/Makefile.am index b57d701d8a0..8ba1ff7382c 100644 --- a/Docs/Images/Makefile.am +++ b/Docs/Images/Makefile.am @@ -27,9 +27,5 @@ EXTRA_DIST = all: : -# Nothing to cleanup in this dummy directory. -clean: - : - # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/client/Makefile.am b/client/Makefile.am index 9b62d698e38..2721953629e 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -18,7 +18,7 @@ #AUTOMAKE_OPTIONS = nostdinc INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ - $(openssl_includes) -I$(top_srcdir)/extra + $(openssl_includes) -I$(top_builddir)/include LIBS = @CLIENT_LIBS@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la diff --git a/extra/Makefile.am b/extra/Makefile.am index 9f18cbf96e6..43981753515 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -16,25 +16,26 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include \ @ndbcluster_includes@ -I$(top_srcdir)/sql \ - -I$(top_srcdir)/extra + -I$(top_builddir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a -BUILT_SOURCES= mysqld_error.h sql_state.h mysqld_ername.h +BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ + $(top_builddir)/include/sql_state.h \ + $(top_builddir)/include/mysqld_ername.h pkginclude_HEADERS= $(BUILT_SOURCES) -created_sources = created_include_files -CLEANFILES = $(created_sources) -SUPERCLEANFILES = $(BUILT_SOURCES) - -all: $(created_sources) +CLEANFILES = $(BUILT_SOURCES) # This will build mysqld_error.h and sql_state.h -mysqld_error.h: created_include_files -mysqld_ername.h: created_include_files -sql_state.h: created_include_files - -created_include_files: comp_err - $(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --name_file=$(top_builddir)/extra/mysqld_ername.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt - touch created_include_files +$(top_builddir)/include/mysqld_error.h: comp_err + $(top_builddir)/extra/comp_err \ + --charset=$(top_srcdir)/sql/share/charsets \ + --out-dir=$(top_builddir)/sql/share/ \ + --header_file=$(top_builddir)/include/mysqld_error.h \ + --name_file=$(top_builddir)/include/mysqld_ername.h \ + --state_file=$(top_builddir)/include/sql_state.h \ + --in_file=$(top_srcdir)/sql/share/errmsg.txt +$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h +$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ resolve_stack_dump mysql_waitpid diff --git a/include/Makefile.am b/include/Makefile.am index e11ca2b4647..08beb4b7236 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -33,15 +33,10 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ mysql_version.h.in my_handler.h my_time.h decimal.h # mysql_version.h are generated -SUPERCLEANFILES = mysql_version.h my_config.h +CLEANFILES = mysql_version.h my_config.h readline # Some include files that may be moved and patched by configure -DISTCLEANFILES = sched.h $(SUPERCLEANFILES) - -clean: - $(RM) -fr readline -distclean: - $(RM) -fr readline +DISTCLEANFILES = sched.h $(CLEANFILES) all-local: my_config.h diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 91ee5e66c83..0670a0befa8 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -24,7 +24,7 @@ target = libmysqlclient.la target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ LIBS = @CLIENT_LIBS@ INCLUDES = -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \ - -I$(top_srcdir)/extra + -I$(top_builddir)/include include $(srcdir)/Makefile.shared diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index e8c576ca2b1..b83ee36dd39 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -26,7 +26,7 @@ LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ INCLUDES = @MT_INCLUDES@ \ -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \ - -I$(top_srcdir)/extra + -I$(top_builddir)/include ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 4cd53216434..2f90d22f990 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -28,7 +28,7 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \ -I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \ -I$(top_srcdir)/regex \ - -I$(top_srcdir)/extra \ + -I$(top_builddir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ noinst_LIBRARIES = libmysqld_int.a diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index d70d7330e55..bd18e7154aa 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -1,7 +1,8 @@ -noinst_PROGRAMS = mysql -bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded -client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES) -tests_sources= $(mysql_client_test_embedded_SOURCES) +noinst_PROGRAMS = mysql +bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded +client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES) +tests_sources = $(mysql_client_test_embedded_SOURCES) +CLEANFILES = $(client_sources) $(tests_sources) link_sources: for f in $(client_sources); do \ @@ -16,7 +17,7 @@ link_sources: DEFS = -DEMBEDDED_LIBRARY INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ - -I$(top_srcdir)/extra $(openssl_includes) + -I$(top_builddir)/include $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) @@ -31,9 +32,5 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) mysql_client_test_embedded_LINK = $(CXXLINK) mysql_client_test_embedded_SOURCES = mysql_client_test.c -clean: - rm -f $(client_sources) - rm -f $(tests_sources) - # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am index 6d4cdc12cf6..1f00d463f08 100644 --- a/ndb/docs/Makefile.am +++ b/ndb/docs/Makefile.am @@ -9,7 +9,7 @@ DOXYOUT = .doxyout NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@ -clean: +clean-local: rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html rm -rf $(DOXYTMP) $(DOXYOUT) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 71b70fc0e4a..221fab13635 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \ fill_help_tables \ mysql_create_system_tables -SUPERCLEANFILES = mysqlbug +DISTCLEANFILES = mysqlbug # We want the right version and configure comand line in mysqlbug mysqlbug: ${top_builddir}/config.status mysqlbug.sh diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index c2bf501eca7..c9c9009a8ec 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/extra +INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER diff --git a/sql/Makefile.am b/sql/Makefile.am index 8ff55898ba4..3c520ac971c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -22,7 +22,7 @@ MYSQLBASEdir= $(prefix) INCLUDES = @MT_INCLUDES@ @ZLIB_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ -I$(top_srcdir)/include -I$(top_srcdir)/regex \ - -I$(srcdir) $(openssl_includes) -I$(top_srcdir)/extra + -I$(srcdir) $(openssl_includes) -I$(top_builddir)/include WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld @@ -115,6 +115,7 @@ DEFS = -DMYSQL_SERVER \ # Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion BUILT_SOURCES = sql_yacc.cc sql_yacc.h EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) +DISTCLEANFILES = lex_hash.h AM_YFLAGS = -d mysql_tzinfo_to_sql.cc: @@ -160,8 +161,5 @@ sql_lex.o: lex_hash.h udf_example.so: udf_example.cc $(CXXCOMPILE) -shared -o $@ $< -distclean: - rm -f lex_hash.h - # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index cfbbb36c489..608bbdb7ae6 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -14,10 +14,11 @@ dist-hook: all: english/errmsg.sys # Use the english errmsg.sys as a flag that all errmsg.sys needs to be -# created. Normally these are created by extra/Makefile.am +# created. Normally these are created by extra/Makefile english/errmsg.sys: errmsg.txt - $(top_builddir)/extra/comp_err --charset=$(srcdir)/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=errmsg.txt + rm $(top_builddir)/include/mysqld_error.h + (cd $(top_builddir)/extra && $(MAKE)) install-data-local: for lang in @AVAILABLE_LANGUAGES@; \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 55801c22c48..1cb07f85e5a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -16,7 +16,7 @@ # Process this file with automake to create Makefile.in INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \ - -I$(top_srcdir)/extra + -I$(top_builddir)/include LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ bin_PROGRAMS= mysqlmanager From 158020b79651e47fff47887442793bf319a85e57 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Jan 2005 19:03:07 +0100 Subject: [PATCH 5/8] there's no need to define UNIV_DEBUG explicitly anymore --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 124e1ce3dcc..b2d8d65439d 100644 --- a/configure.in +++ b/configure.in @@ -1674,8 +1674,8 @@ then elif test "$with_debug" = "full" then # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS" + CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" else # Optimized version. No debug CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" From dde53fbb96b70090b5b7cd44026be577a94dc100 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Jan 2005 19:28:14 +0100 Subject: [PATCH 6/8] ndb_opt_defaults.h: removed usage of SIGRTMIN temorarilly as it causes problems on some platforms ndb/include/ndbapi/ndb_opt_defaults.h: removed usage of SIGRTMIN temorarilly as it causes problems on some platforms BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted --- BitKeeper/etc/logging_ok | 1 + ndb/include/ndbapi/ndb_opt_defaults.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index fe2a38f29bf..6f99987bd9b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -241,6 +241,7 @@ tonu@x153.internalnet tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com +tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com diff --git a/ndb/include/ndbapi/ndb_opt_defaults.h b/ndb/include/ndbapi/ndb_opt_defaults.h index 63b673ed60d..d03a9dcc36f 100644 --- a/ndb/include/ndbapi/ndb_opt_defaults.h +++ b/ndb/include/ndbapi/ndb_opt_defaults.h @@ -17,11 +17,7 @@ #ifndef NDB_OPT_DEFAULTS_H #define NDB_OPT_DEFAULTS_H -#ifdef SIGRTMIN -#define OPT_NDB_SHM_SIGNUM_DEFAULT SIGRTMIN+2 -#else #define OPT_NDB_SHM_SIGNUM_DEFAULT 0 -#endif #define OPT_NDB_SHM_DEFAULT 0 #endif From aeebe7041cc8a976509941d2773eb0f78887ffcc Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 Jan 2005 15:59:29 +0100 Subject: [PATCH 7/8] mysql-test-run.sh: Old Solaris 'test' lack -e mysql-test/mysql-test-run.sh: Old Solaris 'test' lack -e --- mysql-test/mysql-test-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 73f10fca5cf..24ea7a53046 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1429,7 +1429,7 @@ run_testcase () if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then result_file="$result_file$RESULT_EXT" fi - if [ -e "$TESTDIR/$tname.disabled" ] + if [ -f "$TESTDIR/$tname.disabled" ] then comment=`$CAT $TESTDIR/$tname.disabled`; disable_test $tname "$comment" From 79016ecb2c068effd0dee57e96c610988825c074 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 Jan 2005 09:25:56 -0600 Subject: [PATCH 8/8] Bug #5185 mysqldump for windows database gets table names with different case mysqldump.c: Trimmed some lines to be less than 80 chars. Using just NAME_LEN now for table name buffers client/mysqldump.c: Trimmed some lines to be less than 80 chars. Using just NAME_LEN now for table name buffers --- client/mysqldump.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index db86a3714c1..3a93adf5b36 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2083,18 +2083,21 @@ static int dump_all_tables_in_db(char *database) /* - get_actual_table_name -- executes a SHOW TABLES LIKE '%s' to get the actual table name - from the server for the table name given on the command line. we do this because - the table name given on the command line may be a different case (e.g. T1 vs t1) + get_actual_table_name -- executes a SHOW TABLES LIKE '%s' to get the actual + table name from the server for the table name given on the command line. + we do this because the table name given on the command line may be a + different case (e.g. T1 vs t1) RETURN void */ -static void get_actual_table_name( const char *old_table_name, char *new_table_name, int buf_size ) +static void get_actual_table_name( const char *old_table_name, + char *new_table_name, + int buf_size ) { MYSQL_RES *tableRes; MYSQL_ROW row; - char query[ NAME_LEN*2+3 + 50 ]; + char query[ NAME_LEN + 50 ]; DBUG_ENTER("get_actual_table_name"); @@ -2144,7 +2147,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) print_xml_tag1(md_result_file, "", "database name=", db, "\n"); for (; tables > 0 ; tables-- , table_names++) { - char new_table_name[NAME_LEN*+3]; + char new_table_name[NAME_LEN]; /* the table name passed on commandline may be wrong case */ get_actual_table_name( *table_names, new_table_name, sizeof(new_table_name) );