diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /sql/sql_reload.cc | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index f3eab6b84cf..5df5b0ab3f7 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -322,7 +322,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, { DBUG_ASSERT(thd); tmp_write_to_binlog= 0; - if (reset_master(thd)) + if (reset_master(thd, NULL, 0)) { /* NOTE: my_error() has been already called by reset_master(). */ result= 1; |