(3.23 master, 4.0 slave.
Slave loss temp tables everytime FLUSH LOGS on master).
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).
sql/log_event.cc:
fix for #254
(3.23 master, 4.0 slave.
Slave loss temp tables everytime FLUSH LOGS on master).
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way. (I say maybe because I could not
cause a problem, and I don't see how it could happen).
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
mysql-test/r/ctype_collate.result:
SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
SET NAMES charset COLLATE collation is new syntax
Optimization of SET NAMES
sql/set_var.cc:
Optimization of SET NAMES
sql/set_var.h:
Optimization of SET NAMES
sql/sql_yacc.yy:
Optimization of SET NAMES
sql/item.cc:
query_val_str to return param item value in string format
sql/item.h:
Misc defination changes for Item_param
sql/sql_class.h:
Changes for PREP_STMT
sql/sql_string.cc:
Duplicate String::replace to take char * and length as arguments
sql/sql_yacc.yy:
Change to take param marker position to Item_param as an argument
sql/sql_prepare.cc:
Fix for binary + update logs
sql/sql_string.h:
Added new replace()
Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified
sql/log.cc:
Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified
sql/item_sum.cc:
Fixed bug in warning handling.
sql/item_sum.h:
Fixed bug in warning handling.
sql/sql_class.h:
Fixed bug in warning handling.
sql/sql_error.cc:
Fixed bug in warning handling.
strings/my_vsnprintf.c:
After merge fix
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
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
