diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /sql/sql_servers.cc | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
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 0138c3e5a3b..196c138c04d 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -205,8 +205,8 @@ static bool servers_load(THD *thd, TABLE_LIST *tables) free_root(&mem, MYF(0)); init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0)); - if (init_read_record(&read_record_info,thd,table=tables[0].table,NULL,1,0, - FALSE)) + if (init_read_record(&read_record_info,thd,table=tables[0].table, NULL, NULL, + 1,0, FALSE)) DBUG_RETURN(1); while (!(read_record_info.read_record(&read_record_info))) { |