summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 3.23:unknown2003-04-268-18/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set innobase_flush_log_at_trx_commit to 1 by default Fix problem with timestamp on 64 bit systems Reserve alarms for up to 10 slave threads BitKeeper/etc/logging_ok: auto-union mysql-test/t/rpl_alter.test: Auto merged mysys/charset.c: Auto merged sql/log_event.cc: Auto merged mysql-test/r/join.result: Merge with 3.23 mysql-test/t/join.test: Merge with 3.23 sql/ha_innodb.cc: Merge with 3.23; Set innobase_flush_log_at_trx_commit to 1 by default sql/log_event.h: Merge with 3.23; Fix problem with timestamp on 64 bit systems sql/mini_client.cc: Use local version sql/mysqld.cc: Reserve alarms for up to 10 slave threads sql/slave.cc: Use local version sql/sql_list.h: Use local version
| * Fix possible memory overrun when reading broken character set filesunknown2003-04-262-2/+2
| | | | | | | | | | sql/mysqld.cc: Safety fix.
| * Fixed problem with timestamps in binary log on 64 bit machinesunknown2003-04-235-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported fix from 4.1 for bug 212: SELECT query containing a NATURAL JOIN and parentheses in the WHERE clause mysql-test/r/join.result: New test results mysql-test/t/join.test: Test for bug 212 sql/log_event.cc: Removed wrong cast sql/log_event.h: Fixed problem with timestamps in binary log on 64 bit machines sql/sql_list.h: Fix for bug 212 (back ported from 4.1)
| * Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-04-075-25/+24
| |\ | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-3.23 sql/slave.cc: Auto merged
| | * Changed innobase_flush_log_at_trx_commit to be 1 as defaultunknown2003-04-075-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problem with not freed thr_alarm() on slave connect mysql-test/t/rpl_alter.test: Changed name of created test database sql/ha_innobase.cc: Changed innobase_flush_log_at_trx_commit to be 1 as default sql/mini_client.cc: Fixed problem with not freed thr_alarm() sql/mysqld.cc: Allocate some extra thr_alarm slots just to be safe sql/slave.cc: Simple code cleanup
| * | fux bug #183unknown2003-04-032-1/+2
| |/ | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Fix for -fbranch-probabilites (bug 268)unknown2003-04-2617-44/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314) Fix for new bison 1.875 max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211) Don't show port in SHOW PROCESSLIST for system threads Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275) Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many joined tables (Bug 212) acinclude.m4: Fix for -fbranch-probabilites configure.in: Fix for -fbranch-probabilites myisam/mi_open.c: Give error instead of writing to stderr (Which user can't see) mysql-test/r/join.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/r/join_outer.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/r/select.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/t/join.test: Update results after change to NATURAL/LEFT/RIGHT JOIN sql/item_strfunc.cc: Fix for LEFT/RIGHT/MID with multi-byte-character sets sql/mysqld.cc: Fix for new bison 1.875 (Wrong error text message when one got syntax error) sql/sql_class.cc: Don't show port in SHOW PROCESSLIST for system threads sql/sql_insert.cc: max_insert_delayed_threads now works as documented. delayed_insert_timeout now works on Linux sql/sql_parse.cc: Added comment sql/sql_select.cc: Fix problem with ORDER BY being discarded and results returned un-sorted sql/sql_yacc.yy: Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many joined tables.
* | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-262-1/+2
|\ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/igor/dev/mysql-4.0
| * | fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)unknown2003-04-262-1/+2
| | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: fixed incorrect number of affected rows in REPLACE...SELECT... BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | filesort.cc, order_by.result:unknown2003-04-263-4/+46
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 263 order_by.test: Fixed bug 263 mysql-test/t/order_by.test: Fixed bug 263 mysql-test/r/order_by.result: Fixed bug 263 sql/filesort.cc: Fixed bug 263
* | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2003-04-251-121/+112
|\ \ | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * \ Merge mysql.com:/space/my/mysql-4.0unknown2003-04-251-121/+112
| |\ \ | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
| | * | - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>unknown2003-04-251-121/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (General code cleanup, use the GRANT statement instead of updating the privilege tables directly, added option to revoke privileges)
* | | | ut0dbg.h:unknown2003-04-251-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | Print the failing assertion if it fails; helps to analyze bug reports innobase/include/ut0dbg.h: Print the failing assertion if it fails; helps to analyze bug reports
* | | Trimming code with Monty's suggestionsunknown2003-04-251-91/+83
| | | | | | | | | | | | | | | | | | strings/ctype-tis620.c: thai2sortable code optimized all the file formatted with company standards
* | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2003-04-255-84/+10
|\ \ \ | |/ / | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | Merge mysql.com:/space/my/mysql-4.0unknown2003-04-255-84/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-build
| | * | - Updated innodb test results on Heikki's request (InnoDB now supportsunknown2003-04-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANALYZE TABLE) BitKeeper/etc/ignore: Added support-files/MacOSX/ReadMe.txt to the ignore list
| | * | - support-files/MacOSX/ReadMe.txt is now autogenerated from the manualunknown2003-04-253-81/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of being an individual file to avoid redundancy BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd: Delete: support-files/MacOSX/ReadMe.txt Docs/Makefile.am: - Generate the MacOS ReadMe.txt from the manual support-files/MacOSX/Makefile.am: - Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated
* | | | Merge bk-internal:/home/bk/mysql-4.0unknown2003-04-2589-357/+583
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * | | ctype-tis620.c:unknown2003-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow access outside the string strings/ctype-tis620.c: Don't allow access outside the string
| * | | Minor changes in netware directory (From Rob Lyon - Novell)unknown2003-04-2413-4/+108
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/mysql.xdc: Change mode to -rw-rw-r-- netware/BUILD/compile-AUTOTOOLS: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-linux-tools: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-netware-END: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-netware-START: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-netware-all: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-netware-debug: Turned on error checking in all NetWare build scripts. netware/BUILD/compile-netware-standard: Turned on error checking in all NetWare build scripts. netware/BUILD/mwasmnlm: Turned on error checking in all NetWare build scripts. netware/BUILD/mwccnlm: Turned on error checking in all NetWare build scripts. netware/BUILD/mwldnlm: Turned on error checking in all NetWare build scripts. netware/BUILD/nwbootstrap: Add target path suffix
| * | ha_innodb.cc:unknown2003-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0 sql/ha_innodb.cc: When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0
| * | srv0srv.c:unknown2003-04-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown innobase/srv/srv0srv.c: Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown
| * | srv0srv.c:unknown2003-04-241-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient innobase/srv/srv0srv.c: Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient
| * | ha_innodb.h, ha_innodb.cc:unknown2003-04-242-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table sql/ha_innodb.cc: Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table sql/ha_innodb.h: Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table
| * | Fixed bug in SET SQL_BIG_SELECTSunknown2003-04-2424-31/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/select_safe.result: Updated results mysql-test/t/select_safe.test: Added test for SQL_BIG_SELECTS sql/set_var.cc: Fixed bug in SQL_BIG_SELECTS sql/share/czech/errmsg.txt: Updated error messages sql/share/danish/errmsg.txt: Updated error messages sql/share/dutch/errmsg.txt: Updated error messages sql/share/english/errmsg.txt: Updated error messages sql/share/estonian/errmsg.txt: Updated error messages sql/share/french/errmsg.txt: Updated error messages sql/share/german/errmsg.txt: Updated error messages sql/share/greek/errmsg.txt: Updated error messages sql/share/hungarian/errmsg.txt: Updated error messages sql/share/italian/errmsg.txt: Updated error messages sql/share/japanese/errmsg.txt: Updated error messages sql/share/korean/errmsg.txt: Updated error messages sql/share/norwegian-ny/errmsg.txt: Updated error messages sql/share/norwegian/errmsg.txt: Updated error messages sql/share/portuguese/errmsg.txt: Updated error messages sql/share/romanian/errmsg.txt: Updated error messages sql/share/russian/errmsg.txt: Updated error messages sql/share/slovak/errmsg.txt: Updated error messages sql/share/spanish/errmsg.txt: Updated error messages sql/share/swedish/errmsg.txt: Updated error messages sql/share/ukrainian/errmsg.txt: Updated error messages
| * | Changed test slightly to make it repeatableunknown2003-04-242-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (There was a problem on some AMD system when the floating point precision wasn't accurate enough) mysql-test/r/group_by.result: new test result mysql-test/t/group_by.test: Changed test slightly to make it repeatable
| * | mergeunknown2003-04-2450-309/+358
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_list.h: Auto merged support-files/my-huge.cnf.sh: Added query_cache_size support-files/my-large.cnf.sh: Added query_cache_size
| | * | Fixes for valgrindunknown2003-04-2350-309/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added optimzation for clustered index Fixed bug in UPDATE ... ORDER BY Fixed handling of UPDATE ... LIMIT BitKeeper/deleted/.del-.cvsignore~7e29af89a3559f4c: Delete: Images/.cvsignore BitKeeper/deleted/.del-README~d5a4e7ca3a2e87a9: Delete: repl-tests/README BitKeeper/deleted/.del-run-all-tests~4deb6479a13e4568: Delete: repl-tests/run-all-tests BitKeeper/deleted/.del-run.test~3dc5b9bd1e9feea5: Delete: repl-tests/test-repl-alter/run.test BitKeeper/deleted/.del-run.test~4020771cff278f14: Delete: repl-tests/test-bad-query/run.test BitKeeper/deleted/.del-run.test~452f2b66537404a8: Delete: repl-tests/test-dump/run.test BitKeeper/deleted/.del-run.test~b1f0c1f96554df8: Delete: repl-tests/test-auto-inc/run.test BitKeeper/deleted/.del-table-dump-check.master~e13afeb8c79264b5: Delete: repl-tests/test-dump/table-dump-check.master BitKeeper/deleted/.del-table-dump-select.master~744acb955e33f3db: Delete: repl-tests/test-dump/table-dump-select.master BitKeeper/deleted/.del-x.master~29a93ed7956c8693: Delete: repl-tests/test-auto-inc/x.master BitKeeper/deleted/.del-x.master~3b248cbac9abda2b: Delete: repl-tests/test-bad-query/x.master BitKeeper/deleted/.del-foo-dump-master.master~b49ae6bec1e918ee: Delete: repl-tests/test-repl/foo-dump-master.master BitKeeper/deleted/.del-foo-dump-slave.master~f16ed20457d59be9: Delete: repl-tests/test-repl/foo-dump-slave.master BitKeeper/deleted/.del-repl-timestamp.master.reject~3492d2b74b413771: Delete: repl-tests/test-repl-ts/repl-timestamp.master.reject BitKeeper/deleted/.del-repl-timestamp.master~4b7782da5cc13161: Delete: repl-tests/test-repl-ts/repl-timestamp.master BitKeeper/deleted/.del-run.test~a1e32ea1e4253af4: Delete: repl-tests/test-repl/run.test BitKeeper/deleted/.del-run.test~ce5e626c91b760ec: Delete: repl-tests/test-repl-ts/run.test BitKeeper/deleted/.del-sum-wlen-master.master~1a5ea625c79e978: Delete: repl-tests/test-repl/sum-wlen-master.master BitKeeper/deleted/.del-sum-wlen-slave.master~f016d98833433084: Delete: repl-tests/test-repl/sum-wlen-slave.master BitKeeper/deleted/.del-test.master~5829e7b3770179db: Delete: repl-tests/test-repl-alter/test.master BitKeeper/deleted/.del-master-slave.inc~6775f6ae10137c39: Delete: repl-tests/include/master-slave.inc include/my_global.h: Fix for purify/valgrind myisam/mi_info.c: Updated comment mysql-test/r/group_by.result: New test results mysql-test/r/innodb.result: New test results mysql-test/r/join_outer.result: New test results mysql-test/r/multi_update.result: New test results mysql-test/r/null_key.result: New test results mysql-test/r/update.result: New test results mysql-test/t/group_by.test: Added extra explain to 'suspicious' test. mysql-test/t/innodb.test: Added test for UPDATE ... ORDER BY mysql-test/t/join_outer.test: Changed test to be repeatable mysql-test/t/multi_update.test: Slight change of test to catch more bugs mysql-test/t/update.test: Better test for UPDATE ... ORDER BY sql/field.cc: Simple optimization sql/ha_heap.h: Added optimzation for clustered index sql/ha_innodb.cc: Added optimzation for clustered index sql/ha_innodb.h: Added optimzation for clustered index sql/handler.h: Added optimzation for clustered index sql/item_sum.cc: Removed some usage of current_thd sql/mysqld.cc: Fix bug when compiling for purify/valgrind sql/opt_range.cc: Added optimzation for clustered index sql/records.cc: Fixed comment sql/sql_list.h: Fixed comment sql/sql_select.cc: Removed some usage of current_thd sql/sql_select.h: Removed some usage of current_thd sql/sql_union.cc: Removed some usage of current_thd sql/sql_update.cc: Fixed bug in UPDATE ... ORDER BY Fixed handling of UPDATE ... LIMIT support-files/my-huge.cnf.sh: Added default size for query cache support-files/my-large.cnf.sh: Added default size for query cache
* | | | Merge bk-internal:/home/bk/mysql-4.0unknown2003-04-246-189/+186
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * | | Merge pgulutzan@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-231-183/+131
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pgulutzan/mysql-4.0
| | * | | Minor changes to PeterG's internals documentation per comments unknown2003-04-231-183/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from Monty.
| * | | | config-win.h:unknown2003-04-232-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable 'LOAD LOCAL INFILE', for parity with unix binaries. include/config-win.h: Enable 'LOAD LOCAL INFILE', for parity with unix binaries. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Modify PeterG's internals documentation per Monty. Added unknown2003-04-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more detailed explanation of record header and column storage. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Task 761:'mysqlbinlog should not die when readingunknown2003-04-233-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unknown event' client/mysqlbinlog.cc: Task 761:'mysqlbinlog should not die when reading unknown event' The 'force-read' option has been added. sql/log_event.cc: Task 761:'mysqlbinlog should not die when reading unknown event' The'Unknown_log_event' class has been added sql/log_event.h: Task 761:'mysqlbinlog should not die when reading unknown event' The 'Unknown_log_event' class has been added.
* | | | do not execute \* commands inside `identifiers`unknown2003-04-231-1/+1
| | | |
* | | | Merge bk-internal:/home/bk/mysql-4.0unknown2003-04-238-14/+179
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * | | bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't ↵unknown2003-04-233-9/+36
| | | | | | | | | | | | | | | | work anymore
| * | | correct test resultunknown2003-04-231-3/+3
| | | |
| * | | warning when a 4.1 MYI file is opened in 4.0unknown2003-04-232-1/+5
| | | |
| * | | do not mark the table as analyzed unless all the key parts are REALLY analyzed.unknown2003-04-233-4/+138
| | | |
* | | | - added $(SUPERCLEANFILES) to DISTCLEANFILES (bug #201) - thanks tounknown2003-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Christian Hammers for providing this patch
* | | | - updated sample my.cnf files: removed deprecated set-variable keywordsunknown2003-04-234-94/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/my-huge.cnf.sh: - removed deprecated "set-variable" keywords from options support-files/my-large.cnf.sh: - removed deprecated "set-variable" keywords from options support-files/my-medium.cnf.sh: - removed deprecated "set-variable" keywords from options support-files/my-small.cnf.sh: - removed deprecated "set-variable" keywords from options
* | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2003-04-232-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| * | | | - Only ignore _regular_ world-writeable files (thanks to Tim Bunce forunknown2003-04-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discovering this)
| * | | | - fixed typo in instructions on how to add a PATH to .tcshrc on Mac OS Xunknown2003-04-231-2/+1
| | | | |
* | | | | row0mysql.c:unknown2003-04-231-0/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give sensible advice to the user if InnoDB notices index corruption innobase/row/row0mysql.c: Give sensible advice to the user if InnoDB notices index corruption
* | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-221-6/+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-04-221-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0 sql/log_event.cc: Auto merged