summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-09-25 23:00:45 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-01 23:38:27 +0200
commit3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch)
treed08462d84d10324bd05836c968288d8ab1739e11 /sql/sql_table.cc
parentb04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff)
downloadmariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index b86de2f6cc1..19914f31c97 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -5267,7 +5267,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
#ifdef WITH_WSREP
if (WSREP_ON && !thd->wsrep_applier &&
wsrep_create_like_table(thd, table, src_table, create_info))
- goto end;
+ DBUG_RETURN(res);
#endif
/*
@@ -5532,7 +5532,6 @@ err:
res= 1;
}
-end:
DBUG_RETURN(res);
}