diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-16 19:24:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-27 22:51:37 +0100 |
| commit | f97d879bf890fe1d93c459f46410e2be8d26d3b6 (patch) | |
| tree | 948a0951ebc0b32f9ed4b61aebf7143355a7a815 /sql/sql_admin.cc | |
| parent | 1a4746e1285bbe03d616310cd49c3548825d5a1a (diff) | |
| download | mariadb-git-f97d879bf890fe1d93c459f46410e2be8d26d3b6.tar.gz | |
cmake: re-enable -Werror in the maintainer mode
now we can afford it. Fix -Werror errors. Note:
* old gcc is bad at detecting uninit variables, disable it.
* time_t is int or long, cast it for printf's
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index cbc9780d507..0ec6719037c 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -528,7 +528,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, if (!table->table->part_info) { my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0)); - goto err2; + thd->resume_subsequent_commits(suspended_wfc); + DBUG_RETURN(TRUE); } if (set_part_state(alter_info, table->table->part_info, PART_ADMIN)) { @@ -1159,7 +1160,6 @@ err: } close_thread_tables(thd); // Shouldn't be needed thd->mdl_context.release_transactional_locks(); -err2: thd->resume_subsequent_commits(suspended_wfc); DBUG_RETURN(TRUE); } |