mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
mysql-test/include/have_lowercase0.inc:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mysql_protocols.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysys/my_read.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl000015.result:
  C
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/t/rpl000015.test:
  ul
This commit is contained in:
unknown 2006-10-19 11:35:10 +02:00
commit 123275321f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/rpl_log-master.opt
View file

@ -1 +1 @@
--skip-external-locking
--force-restart

1
sql/sql_class.cc
View file

@ -205,6 +205,7 @@ THD::THD()
// Must be reset to handle error with THD's created for init of mysqld
lex->current_select= 0;
start_time=(time_t) 0;
time_after_lock=(time_t) 0;
current_linfo = 0;
slave_thread = 0;
variables.pseudo_thread_id= 0;