diff options
| author | acurtis@pcgem.rdg.cyberkinetica.com <> | 2004-08-30 22:11:14 +0100 |
|---|---|---|
| committer | acurtis@pcgem.rdg.cyberkinetica.com <> | 2004-08-30 22:11:14 +0100 |
| commit | 7ee2f2c6bba7561a51c72d51ad9374cbcf108109 (patch) | |
| tree | 04e96146d63c5d83f8c26bcf39fd30c19ae6945f /sql | |
| parent | 12b1c4b330ddeaae34a6cacb7c9dd761d73972c0 (diff) | |
| parent | 203debc666fcdd35b686fcec55dbe3e088a83bc7 (diff) | |
| download | mariadb-git-7ee2f2c6bba7561a51c72d51ad9374cbcf108109.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1b15bc9a516..172ec48fb18 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3730,8 +3730,12 @@ select_item: YYABORT; if ($4.str) $2->set_name($4.str,$4.length,system_charset_info); - else if (!$2->name) - $2->set_name($1,(uint) ($3 - $1), YYTHD->charset()); + else if (!$2->name) { + char *str = $1; + if (str[-1] == '`') + str--; + $2->set_name(str,(uint) ($3 - str), YYTHD->charset()); + } }; remember_name: |