summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/create.result2
-rw-r--r--mysql-test/t/create.test6
-rw-r--r--sql/sql_table.cc8
3 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 947890d2085..67f81cb4fa5 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1890,5 +1890,7 @@ c1 c2
DROP TABLE t1;
# -- End of Bug#34274
+create table `me:i`(id int);
+drop table `me:i`;
End of 5.1 tests
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 2eeca1eea90..20a607da826 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1532,5 +1532,11 @@ DROP TABLE t1;
###########################################################################
+#
+# Bug#40104 regression with table names?
+#
+create table `me:i`(id int);
+drop table `me:i`;
+
--echo
--echo End of 5.1 tests
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 51b16ba0f43..f20117ebac7 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3427,14 +3427,6 @@ bool mysql_create_table_no_lock(THD *thd,
}
else
{
- #ifdef FN_DEVCHAR
- /* check if the table name contains FN_DEVCHAR when defined */
- if (strchr(alias, FN_DEVCHAR))
- {
- my_error(ER_WRONG_TABLE_NAME, MYF(0), alias);
- DBUG_RETURN(TRUE);
- }
-#endif
path_length= build_table_filename(path, sizeof(path), db, alias, reg_ext,
internal_tmp_table ? FN_IS_TMP : 0);
}