into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
row0sel.c CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.cc:
CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
website address change
cleanup of register_slave_on_master()
mysql-test/r/rpl000002.result:
new output of show slave hosts
sql/mysqld.cc:
user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
cleanup of register_slave_on_master()
sql/sql_repl.cc:
do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
show-slave-auth-info
test case included ( drop) - currently fails, along with rpl000009
mysql-test/r/drop.result:
new test
mysql-test/t/drop.test:
expose a bug in the new symlink table code
sql/slave.cc:
turn off symlink bit to avoid a bug
sql/sql_repl.cc:
turn off symlink bit to avoid a bug
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
include/mysql_com.h:
register slaves
mysql-test/mysql-test-run.sh:
parameters to test slave registration
mysql-test/r/rpl000002.result:
test of slave registration
mysql-test/t/rpl000002.test:
test slave registration
sql/mysql_priv.h:
slave registration
sql/mysqld.cc:
slave registration
sql/slave.cc:
slave registration
sql/slave.h:
slave registration
sql/sql_lex.h:
slave registration
sql/sql_parse.cc:
slave registration
sql/sql_repl.cc:
slave registration
sql/sql_repl.h:
slave registration
sql/sql_yacc.yy:
slave registration
Force add of FN_LIBCHAR to symlinks on windows
Docs/manual.texi:
Cleanup & Changelog
client/mysqladmin.c:
Added quoting for 'drop database'
client/mysqlcheck.c:
Fixed wrong comment syntax
libmysql/net.c:
Cleanup
mysql-test/mysql-test-run.sh:
Better error message.
mysql-test/r/func_test.result:
test for if()
mysql-test/t/func_test.test:
test for if()
mysys/mf_pack.c:
Force add of FN_LIBCHAR to symlinks on windows.
sql/item_cmpfunc.cc:
Fixed problems with decimals withing IF()
sql/mysqlbinlog.cc:
Better error messages.
sql/sql_repl.cc:
Better error messages.
include/mysqld_error.h:
new errors
mysql-test/r/rpl000009.result:
test load data from master
mysql-test/t/rpl000009.test:
test load data from master
sql/mini_client.cc:
extra functionality needed for load data from master and other things
sql/mini_client.h:
addition to API
sql/mysql_priv.h:
mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
more error messages
sql/slave.cc:
cleanup of fetch_nx_table()
sql/slave.h:
cleanup of fetch_nx_table()
sql/sql_base.cc:
remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
remove unused replication variables
sql/sql_class.h:
remove unused replication variabled
sql/sql_db.cc:
make mysql_create_db()/mysql_rm_db() work with thd == 0
(do not write messages to the net) and instead return success/error
sql/sql_lex.h:
added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
LOAD DATA FROM MASTER
sql/sql_repl.h:
LOAD DATA FROM MASTER
sql/sql_yacc.yy:
LOAD DATA FROM MASTER
test heap table/tree overflow in count(distinct)
mysql-test/r/count_distinct2.result:
added test for tree/heap table overflow
mysql-test/t/count_distinct2.test:
test tree/heap table overflow
sql/item_sum.cc:
handle tree overflow in count(distinct)
sql/item_sum.h:
t
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Don't read MyISAM header when running without locking
include/myisam.h:
Don't read header when running without locking.
myisam/mi_locking.c:
Don't update changed flag for temporary files.
myisam/mi_open.c:
Don't read header when running without locking.
myisam/mi_static.c:
Don't read header when running without locking.
sql/item_sum.cc:
Don't write rows in MyISAM tables when using count(distinct)
sql/mysqld.cc:
Don't read MyISAM header when running without locking.
Remove -Sg option.
sql/sql_analyse.h:
Remove duplicate header.
sql/sql_select.cc:
Cleaned up prototypes.
Don't write rows to count(DISTINCT) MyISAM tables.
sql/sql_select.h:
Cleaned up prototypes.
sql/table.h:
A
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed problem with fuzzy dates.
mysql-test/r/func_time.result:
Added test of fuzzy dates
mysql-test/t/func_time.test:
Added test of fuzzy dates
sql/item.cc:
Fixed bug with fuzzy dates
sql/sql_parse.cc:
Remove wrong access check for locks.
(This has to be delayed for 4.0 because there is currently now way
to check for "any of the following privileges"
Docs/manual.texi:
Changelog
Small cleanups
Docs/manual.texi:
Updated how to add new native functions
mysql-test/r/func_crypt.result:
Fix for crypt on FreeBSD
mysql-test/t/func_crypt.test:
Fix for crypt on FreeBSD
mysys/thr_lock.c:
Changed to use statistics_increment macro for statistic variables.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
myisam/myisamdef.h:
Added missing declaration
mysql-test/r/innodb.result:
Changed test based on result from changed optimizer
sql/mysql_priv.h:
Fixed wrong prototype
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
myisam/mi_search.c:
Auto merged
sql/sql_select.cc:
Auto merged
fixed bug/updated count_distinct2 test
changed reset in count distinct to avoid calls to my_free()
include/my_sys.h:
option to free_root() not to do my_free()
include/my_tree.h:
reset_tree()
mysql-test/r/count_distinct2.result:
added group by test
mysql-test/t/count_distinct2.test:
group by test + fixed bug - need to drop table
mysys/my_alloc.c:
mark_blocks_free()
mysys/tree.c:
reset_tree()
sql/item_sum.cc:
in count distinct reset_tree instead of delete_tree
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB
Docs/manual.texi:
Changelog + update of table types
bdb/include/log.h:
Patch from Sleepycat
bdb/log/log.c:
Patch from Sleepycat
bdb/log/log_rec.c:
Patch from Sleepycat
client/mysqladmin.c:
Cleanup
innobase/include/univ.i:
Fix for compilation on Windows
innobase/os/os0file.c:
cleanup
innobase/pars/pars0grm.y:
Fix for compilation on Windows
mysql-test/r/innodb.result:
New test case
mysql-test/t/innodb.test:
New test case
sql/ha_innobase.cc:
cleanup
sql/ha_innobase.h:
Fix for prefix keys
sql/handler.h:
Fix for temporary Innodb tables
sql/item_strfunc.cc:
Fixed bug in REPLACE()
sql/lock.cc:
Fix for temporary Innodb tables
sql/mysqld.cc:
Added --skip-stack-trace
sql/share/english/errmsg.txt:
Better error messages
sql/sql_base.cc:
Fix for temporary Innodb tables
sql/sql_select.cc:
Fix for temporary Innodb tables
sql/sql_table.cc:
Fixed sub char keys for InnoDB
sql/table.h:
Fix for temporary Innodb tables
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqlbinlog.cc:
Auto merged
sql/sql_class.h:
Auto merged
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
Added information about InnoDB and TEMPORARY tables
acinclude.m4:
Portability fixes
client/errmsg.c:
merge with libmysqd/errmsg.c
client/mysqladmin.c:
DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
Portability fixes
configure.in:
Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
Portability fixes
include/global.h:
Portability fixes
isam/_dbug.c:
Portability fixes
mysql-test/mysql-test-run.sh:
Portability fixes
mysql-test/r/show_check.result:
New test for SHOW CREATE
mysql-test/t/show_check.test:
New test for SHOW CREATE
scripts/make_binary_distribution.sh:
Added missing files
sql/filesort.cc:
Added examined_rows to slow query log
sql/log.cc:
Added examined_rows to slow query log
sql/mysql_priv.h:
Added examined_rows to slow query log
sql/mysqlbinlog.cc:
Fixed core dump when using wrong option
sql/mysqld.cc:
Removed not used argument
sql/sql_base.cc:
Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
Added examined_rows to slow query log
sql/sql_parse.cc:
Added examined_rows to slow query log
sql/sql_select.cc:
Added examined_rows to slow query log
sql/sql_select.h:
Added examined_rows to slow query log
sql/sql_show.cc:
Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
Added examined_rows to slow query log
added support for virtual master ( replicating from a directory with binlogs)
test case for backup/restore with virtual master
client/mysqltest.c:
fix to accomodate for new test case
mysql-test/mysql-test-run.sh:
do not automagically start slave
sql/log.cc:
support for virtual master
sql/log_event.cc:
fix for mysqlbinlog
sql/log_event.h:
fix for mysqlbinlog
sql/mysqlbinlog.cc:
fix for mysqlbinlog
sql/slave.cc:
virtual master
sql/slave.h:
virtual master
sql/sql_class.h:
clean-up/fixes for virtual master
sql/sql_repl.cc:
cleanup/fixes for virtual master
sql/sql_repl.h:
virtual master
Some limit optimization
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Delete: innobase/ib_config.h
client/errmsg.c:
Moved error messages from libmysqld/
client/mysql.cc:
Removed warnings
include/errmsg.h:
New info for embedded versions
include/mysql_com.h:
Fixes for embedded MySQL
libmysql/errmsg.c:
Fixes for embedded MySQL
libmysqld/Makefile.am:
Added HANDLER code
libmysqld/lib_sql.cc:
Fixes for embedded MySQL
libmysqld/lib_vio.c:
Fixes for embedded MySQL
BitKeeper/etc/ignore:
Added libmysqld/sql_handler.cc to the ignore list
libmysqld/libmysqld.c:
Fixes for embedded MySQL
mysql-test/r/null_key.result:
Fixed result for 4.0
sql/net_serv.cc:
Fixes for embedded MySQL
sql/sql_parse.cc:
Fixes for embedded MySQL where the query could be a const char*
sql/sql_select.cc:
Added limit optimization
sql/sql_select.h:
Added limit optimization
Changed 'lib' to 'master-data'
Fix for slow slaves
Docs/manual.texi:
Changelog
include/mysql.h:
Fixes for Cygwin
libmysql/libmysql.c:
Fixes for Cygwin
mysql-test/Makefile.am:
Include missing test files
mysql-test/include/master-slave.inc:
Fixes for slow slaves
mysql-test/install_test_db.sh:
Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
Test case for count(*) problem
mysql-test/t/group_by.test:
Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
Change 'lib' to 'master-data'
sql/sql_select.cc:
Fix for count(*) problem
Docs/manual.texi:
Updated TODO
client/mysqlcheck.c:
Fixed portability problems
mysql-test/r/backup.result:
Fixed output after format change for BACKUP TABLE
sql/ha_berkeley.cc:
Added missing variable
sql/opt_range.cc:
Small optimization when calculating key blocks
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
Cleanup
mysql-test/r/rpl000014.result:
Change port number for comparison
mysql-test/r/rpl000015.result:
Change port number for comparison
mysql-test/r/rpl000016.result:
Change port number for comparison
mysql-test/t/rpl000014.test:
Change port number for comparison
mysql-test/t/rpl000015.test:
Change port number for comparison
mysql-test/t/rpl000016.test:
Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
New test results
sql-bench/Results/RUN-mysql-NT_4.0:
New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
New test results
sql-bench/Results/connect-mysql-NT_4.0:
New test results
sql-bench/Results/create-mysql-NT_4.0:
New test results
sql-bench/Results/insert-mysql-NT_4.0:
New test results
sql-bench/Results/select-mysql-NT_4.0:
New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New test results
sql/slave.cc:
Removed not used variable
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Delete: innobase/ib_config.h
Docs/manual.texi:
Changelog
myisam/mi_locking.c:
Cleanup
mysql-test/r/bdb.result:
Test for LOCK TABLES
mysql-test/r/innodb.result:
Test for LOCK TABLES
mysql-test/t/bdb.test:
Test for LOCK TABLES
mysql-test/t/innodb.test:
Test for LOCK TABLES
sql-bench/test-insert.sh:
Allow loop to be small
sql/ha_berkeley.cc:
Fixed bug when using LOCK TABLES with BDB
sql/ha_berkeley.h:
Fixed bug when using LOCK TABLES with BDB
sql/handler.h:
Fixed bug when using LOCK TABLES with BDB
sql/sql_base.cc:
Fixed bug when using LOCK TABLES with BDB
sql/sql_parse.cc:
UNLOCK TABLES ends transaction
sql/sql_select.cc:
Fix to not call index_end() twice
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
sql/Makefile.am:
SCCS merged
Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT
BitKeeper/deleted/.del-have_default_master.inc~a54c86e65a6c4af:
Delete: mysql-test/include/have_default_master.inc
BitKeeper/deleted/.del-have_default_master.require~1465255ffdaf82f:
Delete: mysql-test/r/have_default_master.require
Docs/manual.texi:
Changelog for 3.23.38
acconfig.h:
Added test for PTHREAD_YIELD
acinclude.m4:
Added test for PTHREAD_YIELD
configure.in:
Added test for PTHREAD_YIELD
innobase/os/os0thread.c:
Added test for PTHREAD_YIELD
mysql-test/r/lock.result:
Added test of lock bug
mysql-test/t/lock.test:
Added test of lock bug
mysql-test/t/rpl000014.test:
Removed test of default master parameter
mysql-test/t/rpl000015.test:
Removed test of default master parameter
mysql-test/t/rpl000016.test:
Removed test of default master parameter
sql/ha_myisam.cc:
Don't lock locked tables in REPAIR
sql/sql_select.cc:
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT
Removed unpredictable test from rpl000001.test
Docs/manual.texi:
Added some information about table locks
libmysql/Makefile.shared:
Don't force conf_to_src to be static an all systems
mysql-test/r/rpl000001.result:
Removed unpredictable test
mysql-test/t/rpl000001.test:
Removed unpredictable test
scripts/mysql_zap.sh:
Added --help
strings/ctype-ujis.c:
Removed warnings
Fixed rpl000001 to handle the most common mysql-test-run ports.
configure.in:
Fixed that -ldl is not used for clients
(The old version breaked when client was compiled staticly)
mysql-test/r/rpl000001.result:
Fix to handle the most common mysql-test-run ports.
mysql-test/t/rpl000001.test:
Fix to handle the most common mysql-test-run ports.
mysys/my_alloc.c:
Extended min block a little to get faster mallocs
scripts/mysql_install_db.sh:
Fixed bug when using RPM and one had --basedir in my.cnf
sql/Makefile.am:
Add -ldl to mysqld link line
strings/ctype-ujis.c:
Remove warnings
Don't reconnect client on close
libmysql/libmysql.c:
Don't reconnect on close
mysql-test/r/heap.result:
Fixed heap table test
sql/field.cc:
Backed out wrong HEAP table bug fix
sql/ha_heap.h:
cleanup
sql/mini_client.cc:
Don't reconnect on close
sql/opt_range.cc:
Don't use ranges on HEAP tables with LIKE
Docs/manual.texi:
Updated information about BDB tables.
mysql-test/r/heap.result:
Added test for HEAP bug
mysql-test/t/heap.test:
Added test for HEAP bug
sql/field.cc:
Fixed bug with HEAP tables
sql/gen_lex_hash.cc:
Smallare array
typo/bad merge fixed
chmod a-x for man/*.1 files
man/isamchk.1:
Change mode to -rw-rw-r--
man/mysqlaccess.1:
Change mode to -rw-rw-r--
man/mysqladmin.1:
Change mode to -rw-rw-r--
man/mysqld.1:
Change mode to -rw-rw-r--
man/mysqldump.1:
Change mode to -rw-rw-r--
man/mysqlshow.1:
Change mode to -rw-rw-r--
man/perror.1:
Change mode to -rw-rw-r--
man/safe_mysqld.1:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
new tests added
client/mysqltest.c:
bug fixed: errors from handler.test (that is send_error()
after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
typo fixed
sql/Makefile.am:
bad merge fixed
sql/sql_yacc.yy:
bad merge (?) fixed
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
