BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
Auto merged
BitKeeper/deleted/.del-mysql.xdc:
Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
Auto merged
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
sql/sql_parse.cc:
Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
Auto merged
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
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL
mysql-test/r/func_gconcat.result:
change work with NULL
mysql-test/t/func_gconcat.test:
add test on NULL
sql/item_sum.cc:
correct sql_alloc, ORDER BY and NULL value
add comments
sql/sql_class.h:
move test msg_arg
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
Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.
sql/lex.h:
Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.
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
into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
Fixing UNION's popping up in slow query log
mysql-test/r/cast.result:
Fixing a bug #195
mysql-test/t/cast.test:
Fixing a bug #195
sql/item_timefunc.h:
Fixing a bug #195
sql/sql_union.cc:
Fixing UNION's popping up in the slow query log
into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/query_cache.result:
Updated test for 4.1
mysql-test/t/query_cache.test:
Updated test for 4.1
sql/sql_parse.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix
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
