diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-20 17:18:37 +0300 |
| commit | 34b11fb627df93e395158a27f48baa1c049ddf85 (patch) | |
| tree | 126efa7bce0c3c70a1d3c3cb0099c6615f951e39 /sql/sql_servers.cc | |
| parent | 3937a79886f9c3a1e0c998e66565a71b4a87d984 (diff) | |
| parent | 5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (diff) | |
| download | mariadb-git-34b11fb627df93e395158a27f48baa1c049ddf85.tar.gz | |
Merge with next-mr
Diffstat (limited to 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 8432b68a1d1..b711a273ae8 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -128,7 +128,7 @@ bool servers_init(bool dont_read_servers_table) } /* Initialize the mem root for data */ - init_alloc_root(&mem, ACL_ALLOC_BLOCK_SIZE, 0); + init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0); if (dont_read_servers_table) goto end; @@ -179,7 +179,7 @@ static bool servers_load(THD *thd, TABLE_LIST *tables) my_hash_reset(&servers_cache); free_root(&mem, MYF(0)); - init_alloc_root(&mem, ACL_ALLOC_BLOCK_SIZE, 0); + init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0); init_read_record(&read_record_info,thd,table=tables[0].table,NULL,1,0, FALSE); |