summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge narttu:/my/mysql into tik.mysql.com:/home/my/mysqlunknown2000-12-159-23/+168
|\ | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: Auto merged
| * Fixed that LPAD() and RPAD() cuts argumentsunknown2000-12-159-29/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New test for string functions Docs/manual.texi: Updated changes for 3.23.29 client/mysqldump.c: Cleanup libmysql/libmysql.c: Fixed possible overflow sql/handler.cc: Fixed typo sql/item_strfunc.cc: Fixed that LPAD() and RPAD() cuts arguments sql/mysqld.cc: Better error message on core dump BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | mysql-test/r/rpl000016.resultunknown2000-12-141-0/+11
| | | | | | | | | | | | | | | | forgot to check this in mysql-test/r/rpl000016.result: forgot to check this in
* | client/mysqltest.cunknown2000-12-145-74/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug that created empty result files in no-record mode mysql-test/t/rpl000007.test testing non-replication of load data infile when the table is excluded from replication mysql-test/t/rpl000016.test test purge master logs sql/slave.cc fix memory leaks found by purge master logs test sql/sql_repl.cc fixed race condition and delete before close bug in reset_slave() Overall comments - coverage testing is a very good thing! client/mysqltest.c: fixed bug that created empty result files in no-record mode mysql-test/t/rpl000007.test: testing non-replication of load data infile when the table is excluded from replication mysql-test/t/rpl000016.test: test purge master logs sql/slave.cc: fix memory leaks found by purge master logs test sql/sql_repl.cc: fixed race condition and delete before close bug in reset_slave()
* | I fixed the bug too and had to merge conflictsunknown2000-12-146-20/+77
|\ \ | | | | | | | | | | | | myisammrg/myrg_open.c: merged
| * | client/mysqltest.cunknown2000-12-146-18/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added system command myisammrg/myrg_open.c fixed coredump when opening an empty union table sql/sql_repl.cc fixed warnings, remove confusing comment, fixed coredump in change master to when master.info was corrupted added new replication test case client/mysqltest.c: added system command myisammrg/myrg_open.c: fixed coredump when opening an empty union table sql/sql_repl.cc: fixed warnings, remove confusing comment, fixed coredump in change master to when master.info was corrupted
* | | myrg_open.c empty MRG bug fixed again (fix from 1.8 was removed in 1.9)unknown2000-12-152-4/+6
| | | | | | | | | | | | | | | | | | | | | mysql-test/t/ft0000001.test: comments cleared up myisammrg/myrg_open.c: empty MRG bug fixed again (fix from 1.8 was removed in 1.9)
* | | Mergeunknown2000-12-141-1/+1
|/ / | | | | | | | | BitKeeper/etc/gone: auto-merge
* | Mergeunknown2000-12-141-93/+31
|\ \
| * | mysql-test/mysql-test-run.shunknown2000-12-141-93/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for Bourne shell removed colors optimized echo/expr for bash mysql-test/mysql-test-run.sh: fixes for Bourne shell removed colors optimized echo/expr for bash
* | | Mergeunknown2000-12-140-0/+0
| | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-logging_ok~32b6551b8288c2fa: ***MISSING WEAVE*** BitKeeper/etc/logging_ok: Auto merged
* | | Mergeunknown2000-12-140-0/+0
|/ / | | | | | | | | | | | | BitKeeper/deleted/.del-README.gcov: ***MISSING WEAVE*** BitKeeper/etc/logging_ok: ***MISSING WEAVE***
* | fixed typounknown2000-12-131-1/+1
| |
* | fixes for parallel make, re-added the lost README files in mysql-testunknown2000-12-137-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/compile-pentium-debug: fox for parallel make BUILD/compile-pentium-gcov: fix for parallel make BUILD/compile-pentium: fix to enable parallel make when recursing to subdirectories Build-tools/Do-all-build-steps: fix for parallel make, remove the stale comment to make Tim happy Build-tools/Do-rpm: fix for parallel make
* | fixed typounknown2000-12-132-1/+2
| | | | | | | | | | BitKeeper/etc/ignore: Added BitKeeper/tmp/gone to the ignore list
* | MIT fixunknown2000-12-132-0/+3
| | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/install_test_db mysql-test/mysql-test-run to the ignore list include/global.h: another fix for MIT-threads
* | mysql-test/Makefile.amunknown2000-12-132-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | fixed typo scripts/make_binary_distribution.sh added .MRG and .frm files mysql-test/Makefile.am: fixed typo scripts/make_binary_distribution.sh: added .MRG and .frm files
* | global.h Fix for MIT-threadsunknown2000-12-131-0/+1
| | | | | | | | | | include/global.h: Fix for MIT-threads
* | sql_parse.cc we were using wrong strdupunknown2000-12-131-1/+1
| | | | | | | | | | sql/sql_parse.cc: we were using wrong strdup
* | install_test_db.sh fixes for distributionunknown2000-12-133-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test-run.sh fixes for distribution Makefile.am Fixes for distribution mysql-test/Makefile.am: Fixes for distribution mysql-test/mysql-test-run.sh: fixes for distribution mysql-test/install_test_db.sh: fixes for distribution
* | Merge work.mysql.com:/home/bk/mysqlunknown2000-12-136-21/+85
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql BitKeeper/etc/logging_ok: Auto converge
| * | fixedunknown2000-12-135-20/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run: fixed bug that unconditionally restarted both servers before each test added support for slave-master-info.opt to specify master info options and override defaults for an individual test fixed race conditions in slave start/slave stop added a new rpl test case sql/sql_repl.cc: fixed race conditions in slave start/slave stop
* | | Makefile.am Removed READMEunknown2000-12-131-1/+1
| | | | | | | | | | | | | | | mysql-test/Makefile.am: Removed README
* | | mysql.spec.sh Don't install BDBunknown2000-12-135-2/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do-patch-file Update for new web structure Makefile.am Added dependency for manual_toc.html Makefile.am Replaced chmod with RM to avoid error message include/Makefile.am: Replaced chmod with RM to avoid error message Docs/Makefile.am: Added dependency for manual_toc.html Build-tools/Do-patch-file: Update for new web structure support-files/mysql.spec.sh: Don't install BDB BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge work.mysql.com:/home/bk/mysqlunknown2000-12-122-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql BitKeeper/etc/logging_ok: Auto converge
| * | manual.texi minor wording change in LOAD DATA sectionunknown2000-12-122-1/+2
| | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: minor wording change in LOAD DATA section BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | (no commit message)unknown2000-12-121-0/+1
| | |
* | | --result-file in mysqltest works nicely nowunknown2000-12-124-21/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a new test case that relies on --result-file client/mysqltest.c: allow a mix of --result-file and @ result file specifications mysql-test/mysql-test-run: -record option -R options to mysql-test so taht result files will be compared
* | | client/mysqltest.cunknown2000-12-122-110/+175
|/ / | | | | | | | | | | | | | | | | | | | | | | add --result-file option mysql-test/mysql-test-run do a really good job to kill mysqld if it is stuck client/mysqltest.c: add --result-file option mysql-test/mysql-test-run: do a really good job to kill mysqld if it is stuck
* | test case for a coredump on merge tables. Sergei or Monty, can you fix this?unknown2000-12-125-7/+11
|/ | | | | | mysql-test/mysql-test-run: added support for copying tables into datadir - now only MRG and FRM files are copied - will add others as we come up with samples
* Mergeunknown2000-12-127-2/+49
|\ | | | | | | | | sql/filesort.cc: merged
| * ft0000001.test more tests addedunknown2000-12-127-2/+49
| | | | | | | | | | | | | | | | | | | | | | ft0000002.test several ft-indexes test filesort.cc DBUG_PRINT's added sql/filesort.cc: more DBUG_PRINT's added mysql-test/t/ft0000001.test: more tests added
* | Fixed delete in tables with hidden primary keyunknown2000-12-1213-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove not used BDB logs on shutdown Don't give warnings for repair on slaves Fixed transaction log files Docs/manual.texi: Updated 'known bugs' include/my_sys.h: Added define for checking number of bytes left in the IO_CACHE mysql-test/mysql-test-run: Small bug fixes mysys/mf_iocache2.c: Use new define sql/filesort.cc: Temporary fix for FULLTEXT index sql/ha_berkeley.cc: Fix for delete in tables with hidden primary key Remove not used BDB logs on shutdown sql/ha_myisam.cc: Don't give warnings for repair on slaves sql/hostname.cc: Portability fix sql/log.cc: Fix transaction log files sql/log_event.h: portability fix sql/slave.cc: Don't give warnings for repair on slaves sql/sql_class.h: Cleanup sql/sql_parse.cc: Fixed typo
* | log_event.h fixed load data infile replication for alphaunknown2000-12-111-4/+4
| | | | | | | | | | sql/log_event.h: fixed load data infile replication for alpha
* | sql/sql_repl.ccunknown2000-12-111-3/+3
| | | | | | | | | | | | | | | | last fix in send_file() was wrong sql/sql_repl.cc: last fix in send_file() was wrong
* | I hope I've fixed all the bugs by now, let's test itunknown2000-12-115-7/+27
|/ | | | | | | | | | | | | sql/log_event.h: changed new/delete for Log_event to use my_malloc/my_free sql/mysql_priv.h: wait for slave to get going sql/mysqld.cc: wait for slave to get going in SLAVE START sql/slave.cc: fixed more memory leaks sql/sql_repl.cc: file name was not being \0 terminated in send_file
* Mergeunknown2000-12-1141-32/+454
|\
| * sel000032.test backpropagated from mysql-4.0unknown2000-12-1132-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sel000031.test backpropagated from mysql-4.0 sel000014.result backpropagated from mysql-4.0 sel000006.test s|r/3.23/|r/| sel000007.test s|r/3.23/|r/| sel000008.test s|r/3.23/|r/| sel000009.test s|r/3.23/|r/| sel000010.test s|r/3.23/|r/| sel000011.test s|r/3.23/|r/| sel000012.test s|r/3.23/|r/| sel000013.test s|r/3.23/|r/| sel000014.test s|r/3.23/|r/| sel000015.test s|r/3.23/|r/| sel000016.test s|r/3.23/|r/| sel000017.test s|r/3.23/|r/| sel000018.test s|r/3.23/|r/| sel000019.test s|r/3.23/|r/| sel000020.test s|r/3.23/|r/| sel000021.test s|r/3.23/|r/| sel000022.test s|r/3.23/|r/| sel000023.test s|r/3.23/|r/| sel000024.test s|r/3.23/|r/| sel000025.test s|r/3.23/|r/| sel000026.test s|r/3.23/|r/| sel000027.test s|r/3.23/|r/| sel000028.test s|r/3.23/|r/| sel000029.test s|r/3.23/|r/| sel000030.test s|r/3.23/|r/| sel000033.test s|r/3.23/|r/| sel000005.test s|r/3.23/|r/| ft0000001.test s|r/3.23/|r/| sel000004.test s|r/3.23/|r/| mysql-test/t/sel000004.test: s|r/3.23/|r/| mysql-test/t/ft0000001.test: s|r/3.23/|r/| mysql-test/t/sel000005.test: s|r/3.23/|r/| mysql-test/t/sel000006.test: s|r/3.23/|r/| mysql-test/t/sel000007.test: s|r/3.23/|r/| mysql-test/t/sel000008.test: s|r/3.23/|r/| mysql-test/t/sel000009.test: s|r/3.23/|r/| mysql-test/t/sel000010.test: s|r/3.23/|r/| mysql-test/t/sel000011.test: s|r/3.23/|r/| mysql-test/t/sel000012.test: s|r/3.23/|r/| mysql-test/t/sel000013.test: s|r/3.23/|r/| mysql-test/t/sel000014.test: s|r/3.23/|r/| mysql-test/t/sel000015.test: s|r/3.23/|r/| mysql-test/t/sel000016.test: s|r/3.23/|r/| mysql-test/t/sel000017.test: s|r/3.23/|r/| mysql-test/t/sel000018.test: s|r/3.23/|r/| mysql-test/t/sel000019.test: s|r/3.23/|r/| mysql-test/t/sel000020.test: s|r/3.23/|r/| mysql-test/t/sel000021.test: s|r/3.23/|r/| mysql-test/t/sel000022.test: s|r/3.23/|r/| mysql-test/t/sel000023.test: s|r/3.23/|r/| mysql-test/t/sel000024.test: s|r/3.23/|r/| mysql-test/t/sel000025.test: s|r/3.23/|r/| mysql-test/t/sel000026.test: s|r/3.23/|r/| mysql-test/t/sel000027.test: s|r/3.23/|r/| mysql-test/t/sel000028.test: s|r/3.23/|r/| mysql-test/t/sel000029.test: s|r/3.23/|r/| mysql-test/t/sel000030.test: s|r/3.23/|r/| mysql-test/t/sel000033.test: s|r/3.23/|r/| mysql-test/r/sel000014.result: backpropagated from mysql-4.0 mysql-test/t/sel000031.test: backpropagated from mysql-4.0 mysql-test/t/sel000032.test: backpropagated from mysql-4.0
| * Tests backpropagated from mysql-4.0 bk treeunknown2000-12-1140-31/+453
| | | | | | | | | | | | | | | | | | | | | | mysql-test/t/sel000004.test: backpropagated from mysql-4.0 mysql-test/t/sel000005.test: backpropagated from mysql-4.0 mysql-test/r/sel000004.result: backpropagated from mysql-4.0 mysql-test/r/sel000005.result: backpropagated from mysql-4.0
* | Removed init that crashed BDBunknown2000-12-115-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed newly introduced bug in update BitKeeper/etc/ignore: Added libmysql_r/conf_to_src to the ignore list sql/filesort.cc: Removed init that crashed BDB sql/ha_berkeley.cc: Fixed bug in sub AUTO_INCREMENT keys in BDB tables sql/opt_range.cc: Cleanup sql/sql_update.cc: Fixed newly introduced bug in update
* | Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysqlunknown2000-12-104-45/+98
|\ \ | |/ |/| | | | | Docs/manual.texi: Auto merged
| * Bugfix when using a multi-part unique key in the SET and WHERE partunknown2000-12-104-45/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put PRIMARY KEY and UNIQUE keys before other keys Fixes for auto_increment keys for BDB tables Docs/manual.texi: Changelog sql/ha_berkeley.cc: Fixes for auto_increment keys sql/sql_table.cc: Put PRIMARY KEY and UNIQUE keys before other keys sql/sql_update.cc: Bugfix when using a multi-part unique key in the SET and WHERE part
* | fixed up leaks found by --exit-info=256unknown2000-12-096-16/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better error diagnostic in SLAVE START sql/mini_client.cc: if we fail to connect, we need to free the inited structure sql/mysqld.cc: added end_slave() for slave cleanup sql/slave.cc: fixed serveral memory leaks sql/slave.h: added end_master_info() for clean up sql/sql_class.cc: not changed sql/sql_repl.cc: initialize master info before creating slave thread in SLAVE START - this way we can easily send an error to the client if something is wrong in init_master_info
* | Docs/manual.texiunknown2000-12-092-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | updates for the test suite Docs/Support/test-make-manual abort with a message if a utility fails open the manual in a browser on success Docs/manual.texi: updates for the test suite Docs/Support/test-make-manual: abort with a message if a utility fails open the manual in a browser on success
* | logs were not being called with exiting set to true on server exitunknown2000-12-081-3/+3
| | | | | | | | | | sql/mysqld.cc: added proper close to logs on server exit
* | Merge work.mysql.com:/home/bk/mysqlunknown2000-12-081-30/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql mysql-test/mysql-test-run: Auto merged
| * | mysql-test/mysql-test-rununknown2000-12-081-30/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reversed gcov to work the old way - the worst thing that can happen if slave and master execute the same code at the same time is that we get a lesser count on the code branch execution, but in any case, it will be at least counted once, which is really all we care. Besides, the source tracking is most likely not thread safe, but this is ok for the same reason. mysql-test/mysql-test-run: reversed gcov to work the old way - the worst thing that can happen if slave and master execute the same code at the same time is that we get a lesser count on the code branch execution, but in any case, it will be at least counted once, which is really all we care. Besides, the source tracking is most likely not thread safe, but this is ok for the same reason.
* | | ignore cleaned up, AGAIN!unknown2000-12-092-275/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myrg_open.c delayed queue allocation myisammrg/myrg_open.c: delayed queue allocation BitKeeper/etc/ignore: cleaned up, AGAIN!
* | | Mergeunknown2000-12-094-16/+17
|\ \ \ | |/ / |/| |
| * | mysql-test-run --core-file changed to --exit-info=256unknown2000-12-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's yet another mysqld hidden feature --exit-info=256 is like --core-file but prints info at exit. --exit-info itself implies also one-thread (undocumented) mysql-test/mysql-test-run: --core-file changed to --exit-info=256 it's yet another mysqld hidden feature --exit-info=256 is like --core-file but prints info at exit. --exit-info itself implies also one-thread (undocumented)