diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-10-26 18:05:46 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-10-26 18:05:46 +0500 |
| commit | 0e076d4bb96b80c39bc9588d82566166afbfaed3 (patch) | |
| tree | 89a767a9921239f50bf52cb8dd7248f0f29817c9 /sql/sql_yacc.yy | |
| parent | f78be6c8e997a2e5c5e971749d35ef4e44e425e2 (diff) | |
| parent | 46b03c598dde0df5536bda3b981996219cb2d48a (diff) | |
| download | mariadb-git-0e076d4bb96b80c39bc9588d82566166afbfaed3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 109e8f5434f..cc7ab0a9ca0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6323,6 +6323,12 @@ select_item: MYSQL_YYABORT; if ($4.str) { + if (Lex->sql_command == SQLCOM_CREATE_VIEW && + check_column_name($4.str)) + { + my_error(ER_WRONG_COLUMN_NAME, MYF(0), $4.str); + MYSQL_YYABORT; + } $2->is_autogenerated_name= FALSE; $2->set_name($4.str, $4.length, system_charset_info); } |