Auto-merge latest changes from mysql-5.1-bugteam

72bec2b1 · Mikael Ronstrom · c0890b5d · ba9aeb90 · 72bec2b1
Commit 72bec2b1 authored Jul 29, 2009 by Mikael Ronstrom
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sql/sql_show.cc sql/sql_show.cc +0 -3

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -74,9 +74,6 @@ static TYPELIB grant_types = { sizeof(grant_names)/sizeof(char **),
                               grant_names, NULL};
 #endif

-/* Match the values of enum ha_choice */
-static const char *ha_choice_values[] = {"", "0", "1"};
-
 static void store_key_options(THD *thd, String *packet, TABLE *table,
                              KEY *key_info);