diff options
| author | monty@donna.mysql.com <> | 2000-09-12 03:02:33 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-09-12 03:02:33 +0300 |
| commit | 2776500c220c92bb78df03513cc3dd33588f40e5 (patch) | |
| tree | 051686baf31e5363765879f2437ada3abea6b71b /sql/slave.cc | |
| parent | 497007e2bd9cb127d54a4fdb02253301f404ce7f (diff) | |
| download | mariadb-git-2776500c220c92bb78df03513cc3dd33588f40e5.tar.gz | |
Update to new root alloc, OPTIMIZE TABLE and some other changes
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 2f4f7c10714..b3486e7b97c 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; |