diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /sql/sql_partition_admin.cc | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index 2cc3f247e95..71ab7477391 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2014, SkySQL Ab. - Copyright (c) 2016, MariaDB Corporation + Copyright (c) 2016, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -99,7 +99,7 @@ bool Sql_cmd_alter_table_exchange_partition::execute(THD *thd) thd->prepare_logs_for_admin_command(); DBUG_RETURN(exchange_partition(thd, first_table, &alter_info)); #ifdef WITH_WSREP - error: + wsrep_error_label: /* handle errors in TO_ISOLATION here */ DBUG_RETURN(true); #endif /* WITH_WSREP */ |