mariadb

Commit Graph

Author	SHA1	Message	Date
unknown	e65f8f84da	Merge ramayana.hindu.god:/home/tsmith/m/bk/41 into ramayana.hindu.god:/home/tsmith/m/bk/maint/41	19 years ago
unknown	2098f43a46	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51	19 years ago
unknown	6622bcdb87	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 configure.in: Auto merged	19 years ago
unknown	971050de26	Remove some redundant or unused code from InnoDB (feedback from Marko after applying latest snapshot). storage/innobase/handler/ha_innodb.cc: Remove redundant assignment to thd_to_trx(thd); trx is declared as a reference to thd_to_trx(thd) at the top of the function, so this assignment isn't useful. storage/innobase/include/trx0trx.h: Remove two unused members from struct trx_struct. allow_duplicates and replace_duplicates are not used; a single duplicates member is used instead to represent both flags.	19 years ago
unknown	ccada6ff95	Fix a valgrind warning. For some reason it never popped up before. sql/sql_class.cc: Fix a valgrind warning (row_count_func is used before it was initialized in SQLCOM_CALL)	19 years ago
unknown	a328234f60	Merge trift2.:/MySQL/M51/funcs2-5.1 into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	1b04b4b113	Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/ram/work/b29928.new/b29928.new.5.0	19 years ago
unknown	be4cfe504e	After-merge fixup. - THD::tmp_table_used removed, THD::thread_specific_used used instead.	19 years ago
unknown	fce3a8a318	Fix a bad BitKeeper dependency structure for the "funcs_2" suite: The files below "mysql-test/suite/funcs_2" in version 5.1 did not depend on the equivalent ones in 5.0, probably because they had been checked in independent of each other in both versions. Foreach file F in the suite that has a "deleted" counterpart D, use bk rm $F bk mv $D $F bk edit $F to get those files into the 5.1 suite that (for BK) depend on 5.0. There is only one file whose contents differs between 5.0 and 5.1, restore its current 5.1 contents: mysql-test/suite/funcs_2/r/ndb_charset.result BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7: Delete: mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/funcs_2/charset/charset_master.test: Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4: Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b: Delete: mysql-test/suite/funcs_2/include/check_charset.inc mysql-test/suite/funcs_2/data/charset_utf8.txt: Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt mysql-test/suite/funcs_2/include/check_charset.inc: Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1: Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e: Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6: Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl mysql-test/suite/funcs_2/include/check_charset_ucs2.inc: Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc mysql-test/suite/funcs_2/include/check_charset_utf8.inc: Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16: Delete: mysql-test/suite/funcs_2/r/innodb_charset.result BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472: Delete: mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl: Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl mysql-test/suite/funcs_2/r/innodb_charset.result: Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771: Delete: mysql-test/suite/funcs_2/r/myisam_charset.result BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689: Delete: mysql-test/suite/funcs_2/r/ndb_charset.result mysql-test/suite/funcs_2/r/memory_charset.result: Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/r/myisam_charset.result: Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39: Delete: mysql-test/suite/funcs_2/t/innodb_charset.test BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd: Delete: mysql-test/suite/funcs_2/t/memory_charset.test BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58: Delete: mysql-test/suite/funcs_2/t/myisam_charset.test mysql-test/suite/funcs_2/t/innodb_charset.test: Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test mysql-test/suite/funcs_2/t/memory_charset.test: Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test mysql-test/suite/funcs_2/t/myisam_charset.test: Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d: Delete: mysql-test/suite/funcs_2/t/ndb_charset.test BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433: Delete: mysql-test/suite/funcs_2/readme.txt mysql-test/suite/funcs_2/readme.txt: Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt mysql-test/suite/funcs_2/t/ndb_charset.test: Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test mysql-test/suite/funcs_2/r/ndb_charset.result: Fix a bad BitKeeper dependency structure for the "funcs_2" suite: Restore the 5.1 contents into the 5.0-dependent file.	19 years ago
unknown	d2b9c8c219	Fix an unstable test. mysql-test/r/log_tables.result: Update results. mysql-test/t/log_tables.test: Silence a race condition: TRUNCATE code issues mysql_frm_type without a metadata lock, and finds no table if hits the moment when ALTER is swapping two tables.	19 years ago
unknown	d4ba395aa6	Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0 into mysql.com:/home/ram/work/b29928.new/b29928.new.5.1 mysql-test/r/mysqlbinlog.result: Auto merged sql/item_func.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged mysql-test/t/mysqlbinlog.test: manual merge	19 years ago
unknown	f87acb594a	Fix for bug #29928 : INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out Problem: using "mysqlbinlog \| mysql" for recoveries the connection_id() result may differ from what was used when issuing the statement. Fix: if there is a connection_id() in a statement, write to binlog SET pseudo_thread_id= XXX; before it and use the value later on. mysql-test/r/mysqlbinlog.result: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - test result. mysql-test/t/mysqlbinlog.test: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - test case. sql/item_create.cc: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - set thread_specific_used flag for the connection_id() function. sql/item_func.cc: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - always return thd->variables.pseudo_thread_id as a connection_id() result, as it contains a proper value for both master and slave. sql/log_event.cc: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used is set. sql/sql_class.cc: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - thd->thread_specific_used introduced, which is set if thread specific value(s) used in a statement. sql/sql_class.h: Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect restores from mysqlbinlog out - thd->thread_specific_used introduced, which is set if thread specific value(s) used in a statement.	19 years ago
unknown	ce045a82e4	Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint	19 years ago
unknown	06cffaabd1	Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint into production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint	19 years ago
unknown	1223519705	Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint into production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint	19 years ago
unknown	bb88e1ee6b	Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint into production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint	19 years ago
unknown	c517fea540	Option 6 tries to grant global privileges at the database level which does not work. Removing these attempted privileges makes this identical to option 5 so remove it completely. The spirit of the program appears to be aimed at database privileges, so do not add another option for granting global privileges as it may be unexpected. Fixes bug#14618 (same as previous patch, this time applied to -maint tree). scripts/mysql_setpermission.sh: Option 6 tries to apply global privileges at the database level which does not work - remove it.	19 years ago
unknown	8e62e86f80	Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime into bodhi.(none):/opt/local/work/mysql-5.1-runtime client/mysqldump.c: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged mysql-test/include/mix1.inc: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge.	19 years ago
unknown	25723542a1	Fix an unstable test. It was reliant on the current time. mysql-test/r/func_time.result: Update results (use fixed datetime values instead of NOW()). mysql-test/t/func_time.test: Use fixed datetime values instead of NOW(): the test would have a sporadic failure when current day changed between two consequtive calls to NOW(). The test actually tests FROM_DAYS/TO_DAYS functions, so use of NOW() is not necessary.	19 years ago
unknown	6d3b02d08a	Merge trift2.:/MySQL/M51/mysql-5.1 into trift2.:/MySQL/M51/push-5.1	19 years ago
unknown	b9b4d0cb3c	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776 configure.in: Auto merged	19 years ago
unknown	c5ff0a0dbf	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/10776/50-10776 configure.in: Auto merged	19 years ago
unknown	36bb8de987	Bug #10776 : Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 5.1 specific fixes so cluster will build on AIX (with IBM compiler) config/ac-macros/ha_ndbcluster.m4: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1) build NDB binaries as static on AIX. because that actually works. when building dynamic, with the IBM compiler (xlC_r), and the build breaks on AIX due to missing symbols (__vec__delete2 et al.), try adding -lhC to the Makefile. storage/ndb/src/mgmclient/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) fix path storage/ndb/src/ndbapi/NdbScanOperation.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3) __align is a keyword in xlC_r storage/ndb/test/ndbapi/testIndexStat.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* template can't be static on xlC_r? storage/ndb/test/ndbapi/test_event_merge.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* storage/ndb/test/run-test/main.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar* storage/ndb/test/src/NDBT_Test.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) gptr is now uchar*	19 years ago
unknown	1281fbc58c	Fix for bug #30088 : Can't disable myisam-recover by a value of "". - test result. Problem: we don't proper handle "" value of the --myisam-recover option. Fix: turn off myisam recovering if --myisam-recover="" is set. mysql-test/r/show_check.result: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test result. mysql-test/t/show_check-master.opt: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test case. mysql-test/t/show_check.test: Fix for bug #30088: Can't disable myisam-recover by a value of "". - test case. sql/mysqld.cc: Fix for bug #30088: Can't disable myisam-recover by a value of "". - turn off myisam recovering if --myisam-recover="" is passed.	19 years ago
unknown	f61488c6a1	Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776 into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776 include/mysql.h: Auto merged storage/ndb/src/mgmclient/Makefile.am: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testScanFilter.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged configure.in: manual merge storage/ndb/src/common/util/File.cpp: manual merge storage/ndb/src/mgmsrv/Makefile.am: manual merge	19 years ago
unknown	f5b95d0be1	Bug #10776 : Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 mysqld hasn't been built on AIX with ndb-everything in quite a while. this allowed a variety of changes to be added that broke the AIX build for both the GNU and IBM compilers (but the IBM suite in particular). Changeset lets build to complete on AIX 5.2 for users of the GNU and the IBM suite both. Tudo bem? config/ac-macros/large_file.m4: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) we no longer declare anything large-file on AIX. the GNU C++ compiler declares _LARGE_FILE_API all of its own, and either way we're now pulling in <standards.h> when on AIX, which defines _LARGE_FILE_API (if not already defined). configure.in: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1) build NDB binaries as static on AIX. because that actually works. when building dynamic, with the IBM compiler (xlC_r), and the build breaks on AIX due to missing symbols (__vec__delete2 et al.), try adding -lhC to the Makefile. include/mysql.h: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2) we're now pulling in <standards.h> when on AIX, which defines _LARGE_FILE_API (if not already defined). ndb/src/common/util/File.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3) do not de-scope the standards, for they may be funky macros ndb/src/mgmclient/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4) make IBM C++ compiler happy on AIX ndb/src/mgmsrv/Makefile.am: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5) GNU compiler has no sense of humour about this ndb/test/ndbapi/benchronja.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexAsynch.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexHammer.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexScan.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexTT.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/flexTimedAsynch.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/initronja.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.) ndb/test/ndbapi/testOperations.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7) IBM C compiler on AIX is not happy with the re-def. ndb/test/ndbapi/testScanFilter.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8) The IBM C++ compiler on AIX doesn't like initializing from pow(). This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on. ndb/test/odbc/SQL99_test/SQL99_test.cpp: Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6) MAXTHREADS collides with a #define from <sys/thread.h> on AIX (IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly #undef it here lest someone use it by habit and get really funny results. (K&R says we may #undef non-existent symbols.)	19 years ago
unknown	66e1555aa2	Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51 mysql-test/r/federated.result: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/t/federated.test: Auto merged sql/sql_table.cc: Auto merged storage/federated/ha_federated.h: Auto merged mysql-test/r/innodb_mysql.result: Use local (manual merge)	19 years ago
unknown	82fbe7a418	Merge ramayana.hindu.god:/home/tsmith/m/bk/51 into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged storage/federated/ha_federated.h: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged mysql-test/include/mix1.inc: Manual merge mysql-test/r/innodb_mysql.result: Manual merge	19 years ago
unknown	fe8dd96843	Merge ramayana.hindu.god:/home/tsmith/m/bk/50 into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/50 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged sql/ha_federated.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/innodb_mysql.result: Manual merge mysql-test/t/innodb_mysql.test: Manual merge	19 years ago
unknown	d0e8d1ab54	Bug #29419 "Specifying a join_buffer > 4GB on 64 bit machines not possible." Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB. The test case for this bug is a part of the test suite for bug #5731. sql/sql_select.cc: Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.	19 years ago
unknown	2914bad6ac	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into bodhi.(none):/opt/local/work/mysql-5.1-runtime client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged mysql-test/include/mix1.inc: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge.	19 years ago
unknown	a250e2b453	Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files. They had been introduced in 5.1 and were only later backported to 5.0; as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones, and changes in 5.0 do not propagate into the 5.1 files. To fix this, the (previous) files in 5.1 now are deleted ("bk rm"), and the previously deleted files depending on 5.0 are now moved to the respective source directories ("bk mv"). The current 5.1 contents is restored in these files. If you need the previous history of the 5.1 files ("bk revtool"), access those in "BitKeeper/deleted". Contrary to the original plan, I did not introduce the name "CMakeLists.historic" - mostly in order not to clutter the source tree. This fixes bug#29982. BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Delete: client/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Delete: CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~93f0d646: Delete: dbug/CMakeLists.txt dbug/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~57492bba: Delete: extra/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~8c35983c: Delete: extra/yassl/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f: Delete: extra/yassl/taocrypt/CMakeLists.txt extra/yassl/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Delete: libmysql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1: Delete: mysys/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~9e206e11: Delete: regex/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~95969b72: Delete: server-tools/instance-manager/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01: Delete: sql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~1960eb07: Delete: storage/innobase/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~96726c3b: Delete: storage/myisam/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4: Delete: storage/heap/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12: Delete: strings/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47: Delete: storage/myisammrg/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fc201a06: Delete: tests/CMakeLists.txt tests/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~2a609d33: Delete: vio/CMakeLists.txt vio/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~ef945345: Delete: zlib/CMakeLists.txt zlib/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". client/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". extra/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". libmysql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". mysys/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". regex/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". server-tools/instance-manager/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". sql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/heap/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/innobase/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisam/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisammrg/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". strings/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".	19 years ago
unknown	5404ba422e	Post-merge fixes. sql/sql_base.cc: Fix an incorrect manual merge.	19 years ago
unknown	91f54bf1f7	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.(none):/opt/local/work/mysql-5.0-runtime client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: Auto merged sql/sql_base.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/innodb_mysql.test: Manual merge. sql/sql_table.cc: Manual merge.	19 years ago
unknown	4c11e05ad2	Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime into bodhi.(none):/opt/local/work/mysql-5.1-runtime sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged mysql-test/include/mix1.inc: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge. sql/handler.h: Manual merge. sql/lock.cc: Manual merge. sql/opt_range.cc: Manual merge. sql/sql_base.cc: Manual merge. sql/sql_table.cc: Manual merge.	19 years ago
unknown	31e33aba7b	Addendum to bug 27417: poor test results fixes. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Addendum to bug 27417: removed tests for another bug mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Addendum to bug 27417: removed tests for another bug mysql-test/suite/rpl/r/rpl_row_create_table.result: Addendum to bug 27417: changes to non-transactional tables should be logged even on rollback.	19 years ago
unknown	ed4836857e	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql	19 years ago
unknown	a0af9b7e63	ha_innodb.cc: Warning fixed. sql/ha_innodb.cc: Warning fixed.	19 years ago
unknown	125bc936ac	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.0-opt sql/handler.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged	19 years ago
unknown	6c589f9084	Post-merge fixes	19 years ago
unknown	1f6088cc8b	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.1-opt sql/sp_head.cc: Auto merged	19 years ago
unknown	8e1ec7ab5e	merge of the fix for bug 17417 5.0-opt->5.1-opt	19 years ago
unknown	86d9a7f92a	Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt sql/sql_update.cc: Auto merged	19 years ago
unknown	21d639e573	addendum for the fix for bug 27417: extend the assert so it will run the testsuite	19 years ago
unknown	a66cb1f27a	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug29582 sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged	19 years ago
unknown	8a68e7d2dc	BUG#29582: huge memory consumption with union, subselect, joins: - Don't call mysql_select() several times for the select that enumerates a temporary table with the results of the UNION. Making this call for every subquery execution caused O(#enumerated-rows-in-the-outer-query) memory allocations. - Instead, call join->reinit() and join->exec(), and = disable constant table detection for such joins, = provide special handling for table-less constant subqueries. sql/sql_select.cc: BUG#29582: huge memory consumption with union, subselect, joins: - Don't mark tables as constant if JOIN::no_const_tables flag is set sql/sql_select.h: BUG#29582: huge memory consumption with union, subselect, joins: - Don't mark tables as constant if JOIN::no_const_tables flag is set sql/sql_union.cc: BUG#29582: huge memory consumption with union, subselect, joins: - Don't call mysql_select() several times for the select that enumerates a temporary table with UNION results. - Instead, call join->reinit() and join->exec(). - Provide special handling for table-less constant subqueries.	19 years ago
unknown	23fec91b65	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into gleb.loc:/home/uchum/work/bk/5.1-opt	19 years ago
unknown	124ad9c640	sql_yacc.yy, sp.result, disabled.def: Post-merge fix. mysql-test/t/disabled.def: Post-merge fix. mysql-test/r/sp.result: Post-merge fix. sql/sql_yacc.yy: Post-merge fix.	19 years ago
unknown	6312042ca7	Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120 into gleb.loc:/home/uchum/work/bk/5.1-opt sql/item.cc: Auto merged sql/item.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/t/sp.test: Merge with 5.0-opt.	19 years ago
unknown	a9610aa0e1	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/hf/work/29717/my50-29717	19 years ago

1 2 3 4 5 ...

48977 Commits (97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977) All Branches Search

48977 Commits (97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977)

All Branches