summaryrefslogtreecommitdiff
path: root/sql/set_var.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/set_var.cc
parentb04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff)
downloadmariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 7ad5dc31f6e..5c1e00af33e 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -556,11 +556,7 @@ int mysql_del_sys_var_chain(sys_var *first)
static int show_cmp(SHOW_VAR *a, SHOW_VAR *b)
{
-#ifdef WITH_WSREP
- return my_strcasecmp(system_charset_info, a->name, b->name);
-#else
return strcmp(a->name, b->name);
-#endif /* WITH_WSREP */
}