diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
| commit | ff820c2724e01072db4d5e5c8e56cd4608c9ddb8 (patch) | |
| tree | 1880214478347ec771d96d2b41ffe284cb799b2c /sql/sql_show.cc | |
| parent | 0831433e8f8005331d68cd7edd708feb76dd3325 (diff) | |
| parent | fc59ec4eddbd4f6f518795dcd231b5343234350f (diff) | |
| download | mariadb-git-ff820c2724e01072db4d5e5c8e56cd4608c9ddb8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 803280c56c6..277bc5d8337 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1451,7 +1451,6 @@ int mysqld_show_collations(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); @@ -1503,7 +1502,6 @@ int mysqld_show_charsets(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); |