diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 15:39:40 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-04-25 15:39:40 -0600 |
| commit | 5e414cd222b1d39eb49371ba28fb990a963017c5 (patch) | |
| tree | 661b12c4de745c17137296069347de68053f4266 /sql/log_event.cc | |
| parent | 2c4ad7372c0737d49812f1e22a108dc841b4ba74 (diff) | |
| parent | c49e378ac4a690220d86c11ef40f2382848c6d30 (diff) | |
| download | mariadb-git-5e414cd222b1d39eb49371ba28fb990a963017c5.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-25411_merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index e53cbd310ea..048db4ac95d 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2053,7 +2053,8 @@ int Query_log_event::do_apply_event(RELAY_LOG_INFO const *rli, thd->variables.collation_database= thd->db_charset; /* Execute the query (note that we bypass dispatch_command()) */ - mysql_parse(thd, thd->query, thd->query_length); + const char* found_semicolon= NULL; + mysql_parse(thd, thd->query, thd->query_length, &found_semicolon); } else @@ -3224,10 +3225,12 @@ int Load_log_event::do_apply_event(NET* net, RELAY_LOG_INFO const *rli, /* see Query_log_event::do_apply_event() and BUG#13360 */ DBUG_ASSERT(!rli->m_table_map.count()); /* - Usually mysql_init_query() is called by mysql_parse(), but we need it here + Usually lex_start() is called by mysql_parse(), but we need it here as the present method does not call mysql_parse(). */ - mysql_init_query(thd, 0, 0); + lex_start(thd); + mysql_reset_thd_for_next_command(thd); + if (!use_rli_only_for_errors) { /* |