summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2007-01-23 14:32:10 +0400
committerunknown <bar@mysql.com>2007-01-23 14:32:10 +0400
commit6a7933cd848c004744fab34be214733396460404 (patch)
tree8898f3230daa6d82016b2127dd1a485b441248a2 /mysql-test
parente1b0f07c740489c75c552fa140a43b73a0ead73c (diff)
downloadmariadb-git-6a7933cd848c004744fab34be214733396460404.tar.gz
Bug#25081 SHOW FULL TABLES on table with latin chars in name fails
Problem: The Table_type column of "SHOW FULL TABLES" displayed "ERROR" instead of "BASE TABLE" for tables having non-ascii characters in their names. Reason: tablename to filename encoding was missing, so mysql_frm_type() tried to open a wrong file name. Fix: adding tablename to filename encoding mysql-test/r/show_check.result: Adding test case mysql-test/t/show_check.test: Adding test case sql/sql_show.cc: Adding tablename to filename encoding. Removing variable "end" with is not used anymore.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/show_check.result8
-rw-r--r--mysql-test/t/show_check.test12
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 73450c9a773..a8f524e07dd 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -730,4 +730,12 @@ show keys from `mysqlttest\1`.`a\b`;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
drop table `mysqlttest\1`.`a\b`;
drop database `mysqlttest\1`;
+set names utf8;
+drop table if exists `été`;
+create table `été` (field1 int);
+show full tables;
+Tables_in_test Table_type
+été BASE TABLE
+drop table `été`;
+set names latin1;
End of 5.1 tests
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index be803a74c7b..fb21b5ecaa0 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -563,4 +563,16 @@ show keys from `mysqlttest\1`.`a\b`;
drop table `mysqlttest\1`.`a\b`;
drop database `mysqlttest\1`;
+#
+# Bug#25081 SHOW FULL TABLES on table with latin chars in name fails
+#
+set names utf8;
+--disable_warnings
+drop table if exists `été`;
+--enable_warnings
+create table `été` (field1 int);
+show full tables;
+drop table `été`;
+set names latin1;
+
--echo End of 5.1 tests