summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* crash-me.sh:unknown2003-04-041-0/+45
| | | | | | | | add sorted_group_by parameter sql-bench/crash-me.sh: add sorted_group_by parameter
* Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-041-1/+1
|\ | | | | | | | | | | | | into mysql.com:/home/walrus/bk/40
| * test-transactions.sh:unknown2003-04-031-1/+1
| | | | | | | | | | | | | | | | correct misprint in the test_update sql-bench/test-transactions.sh: correct misprint in the test_update
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-1/+8
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * \ Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-1/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0 sql/log.cc: Auto merged
| | * | log.cc:unknown2003-04-031-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled sql/log.cc: Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled
* | | | More honest --master-ssl* options description. As these do nothingunknown2003-04-031-5/+9
|/ / / | | | | | | | | | | | | | | | | | | yet, better say it and see no traffic on bugs@ and support@.
* | | Explicit message to warn that logging (e.g. binary) is permanently turned offunknown2003-04-031-1/+4
|/ / | | | | | | | | | | | | | | because of writing problems (such message would have been useful during a recent support task).
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-13/+14
|\ \ | | | | | | | | | | | | | | | | | | into hynda.(none):/home/my/bk/mysql-4.0
| * | Fixed a bug when printing error messages. stdout and stderr wereunknown2003-04-031-13/+14
| | | | | | | | | | | | | | | | | | | | | mixed wrongly sometimes.
* | | After merge fixunknown2003-04-031-10/+9
| | | | | | | | | | | | | | | sql/log_event.cc: Fixed a wrong && test -> &
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | add test file for rpl_loaddata.testunknown2003-04-031-0/+8
| |/ /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-034-2/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| * | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-034-2/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
| | * | added test for replication load data into temporary table with additional ↵unknown2003-04-033-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | options sql/log_event.cc: fix bug #183 (Replication of temporary tables not working)
| | * | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-04-032-0/+6
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
| | | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-03-252-0/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| | | | * fix bug with parameters of LOAD DATA INFILE in exec_eventunknown2003-03-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | Updated results after mergeunknown2003-04-031-2/+2
| | | | |
* | | | | Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0unknown2003-04-033-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_vsnprintf.c: Auto merged sql/ha_myisam.cc: Auto merged sql/log.cc: Auto merged
| * | | | | Fixed bug in memory allocation that could affect 64 bit systems (affected ↵unknown2003-04-033-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hammer) mysys/my_vsnprintf.c: safety fix sql/log.cc: safety fix
* | | | | | Merge with 3.23 to get fixes for:unknown2003-04-036-18/+31
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump --delete-master-logs Portability fix for hammer Memory overrun for MyISAM LOAD DATA LOCAL replication bug fix. BitKeeper/etc/logging_ok: auto-union sql/log.cc: Auto merged client/client_priv.h: Merge with 3.23 client/mysqldump.c: Merge with 3.23 myisam/mi_dynrec.c: Merge with 3.23 mysql-test/t/myisam.test: Merge with 3.23 sql/log_event.cc: Merge with 3.23 sql/slave.cc: Merge with 3.23 sql/sql_delete.cc: Merge with 3.23
| * | | | Portability fix (for AMD hammer)unknown2003-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | sql/log.cc: Portability fix (for hammer)
| * | | | Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is wellunknown2003-04-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logged, but read as LOAD DATA INFILE REPLACE" This was just bad && instead of &, but nasty consequences. This should be merged to 4.0 BUT it will not be automatic (some code has moved from log_event.h to log_event.cc, and log_event.cc has changed); please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql to find all the new places. sql/log_event.cc: & instead of && when testing flags sql/slave.cc: & instead of && when testing flags
| * | | | A fix for a bug in MyISAM with large number of NULL columns and atunknown2003-03-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | least one BLOB column.
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-241-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-3.23
| | * | | | Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME;unknown2003-03-241-1/+4
| | | | | |
| * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-193-9/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-3.23
| | * | | | Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;unknown2003-03-193-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only do it if the user specifies --delete-master-logs (new option). Safer + fixes bug #159. client/client_priv.h: New option --delete-master-logs for mysqldump client/mysqldump.c: New option --delete-master-logs for mysqldump BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| * | | | | Safer stack checkingunknown2003-04-031-1/+1
| | | | | |
* | | | | | Sprint task #856 : make table exclusion rules (in replication)unknown2003-04-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%, GRANT and REVOKE will not be replicated on the slave.
* | | | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-314-233/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/greg/bk/mysql-4.0
| * | | | | | Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.defunknown2003-03-314-233/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716: Delete: netware/mysqld.xdc BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e: Delete: netware/nwbootstrap BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9: Delete: netware/nwconfigure BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c: Delete: netware/libmysqld.def
* | | | | | - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in unknown2003-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian for pointing this out) libmysqld/examples/Makefile.am: - added missing @WRAPLIBS@ to LIBS
* | | | | | truncating REPLACE result bug fixunknown2003-03-303-2/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_str.result: test result for truncating REPLACE result mysql-test/t/func_str.test: test with long arguments for REPLACE sql/item_strfunc.cc: fix for counting REPLACE result length
* | | | | Improve make_binary_distribution from Novell code at Monty's requestunknown2003-03-272-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/BUILD/create-patch: Change mode to -rwxrwxr-x scripts/make_binary_distribution.sh: Split BIN_FILES into more generic parts, with no repetition
* | | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-273-29/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/greg/bk/mysql-4.0
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-272-27/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0 sql/mysqld.cc: Auto merged
| | * | | | | Fix for stack size checking on Solaris.unknown2003-03-261-2/+3
| | | | | | |
| | * | | | | Fix for glibc with small stack size (fixes bug when running crash-me)unknown2003-03-262-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql-bench/limits/mysql.cfg: Update to new crash me
| * | | | | | mysqld.cc:unknown2003-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction sql/mysqld.cc: Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
| * | | | | | fixed problem of port without host in SHOW PROCESSLIST (bug 189)unknown2003-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_show.cc: fixed problem of port without host in SHOW PROCESSLIST
* | | | | | | Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-266-31/+196
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/greg/bk/mysql-4.0
| * | | | | | - fixed typo (build_command -> build-command)unknown2003-03-251-1/+1
| | | | | | |
| * | | | | | - added new option "--build-command" to be able to use differentunknown2003-03-251-31/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commands for building the sources - removed duplicate option "--revision" - added help for new option and reformatted help text a bit
| * | | | | | crash-me.sh:unknown2003-03-261-0/+109
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add new parameter checks length_of_varchar_field, add new auxilary functions: get_recordset compare_recordset print_recordset sql-bench/crash-me.sh: add new parameter checks length_of_varchar_field, add new auxilary functions: get_recordset compare_recordset print_recordset
| * | | | | Fix for small bug #186 (If a connection has temporary tables and doesunknown2003-03-251-0/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESET MASTER, this breaks replication). In the slave SQL thread, any DROP TEMPORARY TABLE is silently converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant "table does not exist". See comments in code or bug #186 for an example of how irrelevant errors like this can arise.
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-253-0/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 mysql-test/r/group_by.result: Auto merged mysql-test/t/group_by.test: Auto merged