- 09 Aug, 2007 1 commit
-
-
unknown authored
which is faster than open_table_def() func. This patch fixes the porblem with information_schema test timeout. sql/unireg.h: added description of flags
-
- 08 Aug, 2007 1 commit
-
-
unknown authored
Completion patch, since it is possible that Log_event::write_header() is called with no current thread. When starting the server, there is no thread available, but MYSQL_BIN_LOG::open() is called to initialize the binary log. The function writes a format description log event to the binary log, which means that Log_event::write_header() can be called with no current thread object available. sql/log_event.cc: Since Log_event::write_header() can be called from inside init_server_components(), it is possible that thd is NULL. In this case, we set the time of the event to the current time instead of the start time of the query.
-
- 07 Aug, 2007 3 commits
-
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M51/clone-5.1
-
unknown authored
mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/innodb_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/innodb_views.result: Updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file mysql-test/suite/funcs_1/r/memory_func_view.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/memory_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/memory_views.result: Updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/myisam_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/myisam_views.result: Updated result file mysql-test/suite/funcs_1/views/views_master.inc: updated test file
-
- 06 Aug, 2007 4 commits
-
-
unknown authored
Additional changes for bug#29903 - Changed to do embedded build part as normal build, when WITH_EMBEDDED_SERVER is set. - Allow both normal and debug build with embedded. - Build static embedded library by pointing out all source and compile it all, i.e. not building libraries from libraries, not portable. - Let embedded use generated files from the "sql" directory, added dependencies to make sure built before embedded. - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only linked in when debug target is used. - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as others can't depend on it, not defined at configure time. Instead set the output file name. - Created work around for bug in CMake 2.4.6 and output names, to set the "mysqld<suffix>.pdb" name to the same base name. - Set the correct manifest "name" (patch by iggy) CMakeLists.txt: Changes for embedded and Windows libmysql/CMakeLists.txt: Changes for embedded and Windows libmysqld/CMakeLists.txt: Changes for embedded and Windows libmysqld/examples/CMakeLists.txt: Changes for embedded and Windows mysys/CMakeLists.txt: Changes for embedded and Windows regex/CMakeLists.txt: Changes for embedded and Windows server-tools/instance-manager/CMakeLists.txt: Changes for embedded and Windows sql/CMakeLists.txt: Changes for embedded and Windows storage/archive/CMakeLists.txt: Changes for embedded and Windows storage/blackhole/CMakeLists.txt: Changes for embedded and Windows storage/csv/CMakeLists.txt: Changes for embedded and Windows storage/example/CMakeLists.txt: Changes for embedded and Windows storage/federated/CMakeLists.txt: Changes for embedded and Windows storage/heap/CMakeLists.txt: Changes for embedded and Windows storage/innobase/CMakeLists.txt: Changes for embedded and Windows storage/myisam/CMakeLists.txt: Changes for embedded and Windows storage/myisammrg/CMakeLists.txt: Changes for embedded and Windows strings/CMakeLists.txt: Changes for embedded and Windows vio/CMakeLists.txt: Changes for embedded and Windows win/README: Changes for embedded and Windows win/configure.js: Changes for embedded and Windows win/mysql_manifest.cmake: Changes for embedded and Windows
-
unknown authored
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new scripts/make_win_bin_dist: Auto merged
-
unknown authored
Corrected install path scripts/make_win_bin_dist: Corrected install path
-
unknown authored
Copy embedded .pdb and static debug lib scripts/make_win_bin_dist: Copy embedded .pdb and static debug lib
-
- 05 Aug, 2007 5 commits
-
-
unknown authored
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new mysql-test/mysql-test-run.pl: SCCS merged
-
unknown authored
Search "relwithdebinfo" directory in CMake Visual Studio build Search for "mysqld-debug" even in source tree mysql-test/mysql-test-run.pl: Search "relwithdebinfo" directory in CMake Visual Studio build Search for "mysqld-debug" even in source tree
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
-
- 04 Aug, 2007 6 commits
-
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/show_check.test: Auto merged mysys/charset.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged sql/log_event.cc: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
-
unknown authored
-
unknown authored
into amd64.(none):/src/mysql-5.1-build_29903 BitKeeper/etc/ignore: auto-union client/client_priv.h: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Auto merged client/mysql.cc: Auto merged libmysqld/CMakeLists.txt: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Manual merge.
-
unknown authored
into mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
-
unknown authored
- GCov fix. mysql-test/r/mysql.result: Bug#29903 The CMake build method does not produce the embedded library. -Result mysql-test/t/mysql.test: Bug#29903 The CMake build method does not produce the embedded library. - Test for warning message.
-
- 03 Aug, 2007 20 commits
-
-
unknown authored
- Additional changes to correct link failure in Do-linkall script. libmysqld/libmysqld.def: Bug#29903 The CMake build method does not produce the embedded library. - Missing exports.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/deleted/.del-readme.txt-grumble-grumble: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build libmysql/CMakeLists.txt: merge fix
-
unknown authored
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
-
unknown authored
Removed space between '-D' and symbol CMakeLists.txt: Removed space between '-D' and symbol
-
unknown authored
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new BitKeeper/deleted/.del-README~1: SCCS merged BitKeeper/deleted/.del-configure.js: ul dbug/CMakeLists.txt: SCCS merged extra/CMakeLists.txt: SCCS merged extra/yassl/CMakeLists.txt: SCCS merged extra/yassl/taocrypt/CMakeLists.txt: SCCS merged scripts/CMakeLists.txt: SCCS merged server-tools/instance-manager/CMakeLists.txt: SCCS merged sql/CMakeLists.txt: SCCS merged storage/myisam/CMakeLists.txt: SCCS merged
-
unknown authored
sql/table.cc: do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set
-
unknown authored
Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118) win/README: - Removed references to PARTITION engine, 5.1 only win/configure.js: - Removed references to PARTITION engine, 5.1 only extra/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". myisam/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". scripts/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". server-tools/instance-manager/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". sql/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". mysys/CMakeLists.txt: Restored include path to "mysys" itself dbug/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/taocrypt/CMakeLists.txt: Changed to optionally be included to give a file list only zlib/CMakeLists.txt: Changed to optionally be included to give a file list only libmysql/CMakeLists.txt: For compatibility with Visual Studio 2005, list all files that are to be part of the library build, i.e. libraries can't be built from other libraries. Set SOURCE_SUBLIBS and include the file listings from "zlib", "dbug", "taocrypt" and "yassl"
-
unknown authored
- Changes to correct and test Windows embedded build. BitKeeper/etc/ignore: Bug#29903 The CMake build method does not produce the embedded library. - Ignore auto-generated Windows embedded resources. CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Hardcode CSV for all configurations. - Add client directory for gen_lex_hash dependency. client/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Build the mysqlclient library and echo for the embedded solution. client/client_priv.h: Bug#29903 The CMake build method does not produce the embedded library. - Defined new option. client/mysql.cc: Bug#29903 The CMake build method does not produce the embedded library. - Add server-arg command line parameter libmysqld/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc message.h and lex_hash.h. - Link csv library to libmsyqld. libmysqld/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. libmysqld/examples/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Follow existing naming convention. libmysqld/examples/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. mysql-test/mysql-test-run.pl: Bug#29903 The CMake build method does not produce the embedded library. - Move embedded option block earlier in the script. - Added the path to the libmysqld.dll to Windows path. win/README: Bug#29903 The CMake build method does not produce the embedded library. - Add instructions for building/testing the embedded library.
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-extra.c: Auto merged
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team mysql-test/r/show_check.result: Auto merged mysql-test/t/show_check.test: Auto merged
-
unknown authored
Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble BitKeeper/deleted/.del-readme.txt-grumble-grumble: Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines BitKeeper/etc/ignore: auto-union configure.in: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged include/mysql.h: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/handler.cc: Auto merged sql/item.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/sql_parse.cc: merge fix sql/sql_select.cc: merge fix
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
-
unknown authored
sql/rpl_record.cc: Factoring out expression and putting it in an auto variable. sql/rpl_utility.cc: Removing a check that causes compile warnings. sql/rpl_utility.h: Ensuring that there is enough memory for the metadata, to avoid reads from uninitialized memory. Initializing the memory to keep valgrind quiet.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines sql/sql_insert.cc: Auto merged
-
unknown authored
client/CMakeLists.txt: add mysqlslap back in for 5.1
-
unknown authored
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28875 mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysys/charset.c: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_string.cc: Auto merged strings/conf_to_src.c: Auto merged strings/ctype-extra.c: Auto merged strings/ctype.c: Auto merged include/m_ctype.h: After merge fix mysql-test/r/ctype_ucs.result: After merge fix mysql-test/r/func_time.result: After merge fix mysql-test/t/ctype_ucs.test: After merge fix mysql-test/t/func_time.test: After merge fix sql/sql_lex.cc: After merge fix sql/sql_lex.h: After merge fix sql/sql_yacc.yy: After merge fix
-