diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-15 04:41:57 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-15 04:41:57 +0200 |
| commit | 11117565a3682ea800d1b988775cd05ef78b4fb8 (patch) | |
| tree | 872ca3e7569fe0db0147fd6f118af292b828ffc0 /sql/sql_parse.cc | |
| parent | 13a5a24c6170921bb97796d96ca9f0ac20e5308e (diff) | |
| parent | fcf035a0d85bc49c8c071246ce22a19f2fea395b (diff) | |
| download | mariadb-git-11117565a3682ea800d1b988775cd05ef78b4fb8.tar.gz | |
merge with 3.23 to get:
- Fix for empty table/column names
mysql-test/t/create.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.pl:
Auto merged
sql/filesort.cc:
merge with 3.23
sql/sql_table.cc:
merge with 3.23
tests/grant.res:
merge with 3.23
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8fe5922baf0..dde4b6c5c93 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3218,8 +3218,7 @@ TABLE_LIST *add_table_to_list(Table_ident *table, LEX_STRING *alias, if (!table) DBUG_RETURN(0); // End of memory alias_str= alias ? alias->str : table->table.str; - if (table->table.length > NAME_LEN || - check_table_name(table->table.str,table->table.length) || + if (check_table_name(table->table.str,table->table.length) || table->db.str && check_db_name(table->db.str)) { net_printf(&thd->net,ER_WRONG_TABLE_NAME,table->table.str); |