diff options
| author | unknown <svoj@june.mysql.com> | 2008-03-21 12:46:01 +0400 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2008-03-21 12:46:01 +0400 |
| commit | f0e55820df999eb2156fb6aaed5292ffac74a030 (patch) | |
| tree | 03fb9b7280d7c3977cc0993634980566fc51daec /sql/sql_servers.cc | |
| parent | 95023bb9b0702cc9e080d67ab79cf56d2c12fd97 (diff) | |
| parent | 503dfdbc8064f18f7df02d33766710da9549eafd (diff) | |
| download | mariadb-git-f0e55820df999eb2156fb6aaed5292ffac74a030.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG34790/mysql-5.1-engines
into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
sql/sql_servers.cc:
Auto merged
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 6255901d782..4390919f8c7 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -166,6 +166,9 @@ end: RETURN VALUES FALSE Success TRUE Error + + TODO + Revert back to old list if we failed to load new one. */ static bool servers_load(THD *thd, TABLE_LIST *tables) @@ -175,10 +178,9 @@ static bool servers_load(THD *thd, TABLE_LIST *tables) bool return_val= TRUE; DBUG_ENTER("servers_load"); - /* first, send all cached rows to sleep with the fishes, oblivion! - I expect this crappy comment replaced */ - free_root(&mem, MYF(MY_MARK_BLOCKS_FREE)); my_hash_reset(&servers_cache); + free_root(&mem, MYF(0)); + init_alloc_root(&mem, ACL_ALLOC_BLOCK_SIZE, 0); init_read_record(&read_record_info,thd,table=tables[0].table,NULL,1,0); while (!(read_record_info.read_record(&read_record_info))) |