diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-03-05 22:13:33 +0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-03-05 22:13:33 +0400 |
| commit | 997f11f270b123baa34060026905930c43ea40b3 (patch) | |
| tree | e3022f508e6b88ed24bf0ed9eb0eda2843a7a121 /sql/sql_parse.cc | |
| parent | 190a65bf07c2216b8ccafe21a880f6bbbece56e8 (diff) | |
| download | mariadb-git-997f11f270b123baa34060026905930c43ea40b3.tar.gz | |
fixed Bug #2985
"Table truncated when creating another table name with Spaces"
added to check_db_name, check_table_name and check_column_name
test for end space
mysql-test/r/create.result:
added test for Bug #2985
"Table truncated when creating another table name with Spaces"
mysql-test/t/create.test:
added test for Bug #2985
"Table truncated when creating another table name with Spaces"
sql/sql_db.cc:
cancel strip end spaces for database name
sql/sql_parse.cc:
cancel strip end spaces for database name
sql/table.cc:
added to check_db_name, check_table_name and check_column_name
test for end space
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ac3ccd4fc62..bab59a162be 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1123,8 +1123,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, statistic_increment(com_stat[SQLCOM_CREATE_DB],&LOCK_status); // null test to handle EOM - if (!db || !strip_sp(db) || !(alias= thd->strdup(db)) || - check_db_name(db)) + if (!db || !(alias= thd->strdup(db)) || check_db_name(db)) { net_printf(&thd->net,ER_WRONG_DB_NAME, db ? db : "NULL"); break; @@ -1140,8 +1139,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, statistic_increment(com_stat[SQLCOM_DROP_DB],&LOCK_status); char *db=thd->strdup(packet), *alias; // null test to handle EOM - if (!db || !strip_sp(db) || !(alias= thd->strdup(db)) || - check_db_name(db)) + if (!db || !(alias= thd->strdup(db)) || check_db_name(db)) { net_printf(&thd->net,ER_WRONG_DB_NAME, db ? db : "NULL"); break; @@ -2320,8 +2318,7 @@ mysql_execute_command(void) case SQLCOM_CREATE_DB: { char *alias; - if (!strip_sp(lex->name) || !(alias=thd->strdup(lex->name)) || - check_db_name(lex->name)) + if (!(alias=thd->strdup(lex->name)) || check_db_name(lex->name)) { net_printf(&thd->net,ER_WRONG_DB_NAME, lex->name); break; @@ -2350,8 +2347,7 @@ mysql_execute_command(void) case SQLCOM_DROP_DB: { char *alias; - if (!strip_sp(lex->name) || !(alias=thd->strdup(lex->name)) || - check_db_name(lex->name)) + if (!(alias=thd->strdup(lex->name)) || check_db_name(lex->name)) { net_printf(&thd->net,ER_WRONG_DB_NAME, lex->name); break; |