diff options
| author | unknown <serg@serg.mylan> | 2004-01-14 11:52:25 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-01-14 11:52:25 +0100 |
| commit | cbc748899635d8a564fc2c3cce9eee04edc1cd73 (patch) | |
| tree | 3917548dd5ca7f535acba58d9289a0b7d854eac4 /sql/sql_show.cc | |
| parent | 7eea262321ed50eba83fa3369c9071f48a1e4757 (diff) | |
| download | mariadb-git-cbc748899635d8a564fc2c3cce9eee04edc1cd73.tar.gz | |
bugs #2280, #2281 - show create table should always return a valid sql statement
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 52f7e6cb9ed..ab761ad761d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -997,6 +997,19 @@ mysqld_dump_create_info(THD *thd, TABLE *table, int fd) DBUG_RETURN(0); } +/* possible TODO: call find_keyword() from sql_lex.cc here */ +static bool require_quotes(const char *name, uint length) +{ + uint i, d, c; + for (i=0; i<length; i+=d) + { + c=((uchar *)name)[i]; + d=my_mbcharlen(system_charset_info, c); + if (d==1 && !system_charset_info->ident_map[c]) + return 1; + } + return 0; +} void append_identifier(THD *thd, String *packet, const char *name, uint length) @@ -1007,7 +1020,8 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) else qtype= '`'; - if (thd->options & OPTION_QUOTE_SHOW_CREATE) + if ((thd->options & OPTION_QUOTE_SHOW_CREATE) || + require_quotes(name, length)) { packet->append(&qtype, 1); packet->append(name, length, system_charset_info); |