diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-12 03:14:13 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-12 03:14:13 +0300 |
| commit | de04a97b613356f19bfbe67856cda64774865832 (patch) | |
| tree | c167967c90129e2f7d3757c7e35b3ccd2668436e /sql/slave.cc | |
| parent | 2f6af71721a990b807ab07805a188b1f03b6d213 (diff) | |
| parent | fe4cccd6a43496395ec52e9043cd4350e5eac69d (diff) | |
| download | mariadb-git-de04a97b613356f19bfbe67856cda64774865832.tar.gz | |
Merge
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 13b9acf1e78..79678b34b1a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -559,7 +559,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) { Query_log_event* qev = (Query_log_event*)ev; int q_len = qev->q_len; - init_sql_alloc(&thd->mem_root, 8192); + init_sql_alloc(&thd->mem_root, 8192,0); thd->db = (char*)qev->db; if(db_ok(thd->db, replicate_do_db, replicate_ignore_db)) { @@ -604,7 +604,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) thd->db = 0;// prevent db from being freed thd->query = 0; // just to be sure close_thread_tables(thd); - free_root(&thd->mem_root); + free_root(&thd->mem_root,0); if (thd->query_error) { sql_print_error("Slave: error running query '%s' ", @@ -628,7 +628,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) case LOAD_EVENT: { Load_log_event* lev = (Load_log_event*)ev; - init_sql_alloc(&thd->mem_root, 8192); + init_sql_alloc(&thd->mem_root, 8192,0); thd->db = (char*)lev->db; thd->query = 0; thd->query_error = 0; |