bk commit into 5.1 tree (bar:1.2372) BUG#25081

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2372 07/01/11 14:23:28 bar@stripped +3 -0
  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

  sql/sql_show.cc
    1.380 07/01/11 14:23:25 bar@stripped +3 -1
    Adding tablename to filename encoding

  mysql-test/t/show_check.test
    1.73 07/01/11 14:23:25 bar@stripped +12 -0
    Adding test case

  mysql-test/r/show_check.result
    1.109 07/01/11 14:23:25 bar@stripped +8 -0
    Adding test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.1.b25081

--- 1.379/sql/sql_show.cc	2006-12-02 00:12:01 +04:00
+++ 1.380/sql/sql_show.cc	2007-01-11 14:23:25 +04:00
@@ -2648,7 +2648,9 @@
               }
               else
               {
-                my_snprintf(end, len, "/%s%s", file_name, reg_ext);
+                build_table_filename(path, sizeof(path),
+                                     base_name, file_name, reg_ext, 0);
+
                 switch (mysql_frm_type(thd, path, &not_used)) {
                 case FRMTYPE_ERROR:
                   table->field[3]->store(STRING_WITH_LEN("ERROR"),

--- 1.108/mysql-test/r/show_check.result	2006-11-30 00:59:03 +04:00
+++ 1.109/mysql-test/r/show_check.result	2007-01-11 14:23:25 +04:00
@@ -730,4 +730,12 @@
 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

--- 1.72/mysql-test/t/show_check.test	2006-11-19 22:19:49 +04:00
+++ 1.73/mysql-test/t/show_check.test	2007-01-11 14:23:25 +04:00
@@ -563,4 +563,16 @@
 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