diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
| commit | aa900a5ecee00b40e5add6c88805587a850b057a (patch) | |
| tree | 7e42515465680bf9479f44de0c710044aa122610 /sql/log_event.cc | |
| parent | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (diff) | |
| download | mariadb-git-aa900a5ecee00b40e5add6c88805587a850b057a.tar.gz | |
After merge fixes + bugs from last merge
mysql-test/mysql-test-run.sh:
Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
Fix --ddd option
mysql-test/t/union.test:
After merge fix
sql/item.cc:
Fixed typo
sql/log_event.cc:
Move current_tablenr to open_tables()
sql/protocol.h:
Fixed wrong memory reference
sql/set_var.cc:
After merge fix
sql/slave.cc:
Reset thd->lex.current_select before execute
sql/sql_base.cc:
Move current_tablenr to open_tables()
sql/sql_class.cc:
Move current_tablenr to open_tables()
Add missing update_charset()
sql/sql_parse.cc:
Move current_tablenr to open_tables()
Simple cleanup
sql/table.cc:
Code cleanup
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 3b04baf7ae7..8a52ad9ebca 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -911,7 +911,6 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) if (db_ok(thd->db, replicate_do_db, replicate_ignore_db)) { thd->set_time((time_t)when); - thd->current_tablenr = 0; thd->query_length= q_len; VOID(pthread_mutex_lock(&LOCK_thread_count)); thd->query = (char*)query; @@ -1617,7 +1616,6 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, if (db_ok(thd->db, replicate_do_db, replicate_ignore_db)) { thd->set_time((time_t)when); - thd->current_tablenr = 0; VOID(pthread_mutex_lock(&LOCK_thread_count)); thd->query_id = query_id++; VOID(pthread_mutex_unlock(&LOCK_thread_count)); |