bk commit into 5.1 tree (bar:1.2408)

[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.2408 07/01/23 14:37:12 bar@stripped +2 -0
  Merge abarkov@stripped:/home/bk/mysql-5.1-rpl
  into  mysql.com:/home/bar/mysql-5.1.b25081

  sql/sql_show.cc
    1.385 07/01/23 14:37:06 bar@stripped +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.110 07/01/23 14:37:05 bar@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.384/sql/sql_show.cc	2007-01-16 16:06:25 +04:00
+++ 1.385/sql/sql_show.cc	2007-01-23 14:37:06 +04:00
@@ -2489,7 +2489,7 @@
   ST_SCHEMA_TABLE *schema_table= tables->schema_table;
   SELECT_LEX sel;
   INDEX_FIELD_VALUES idx_field_vals;
-  char path[FN_REFLEN], *end, *base_name, *orig_base_name, *file_name;
+  char path[FN_REFLEN], *base_name, *orig_base_name, *file_name;
   uint len;
   bool with_i_schema;
   enum enum_schema_tables schema_table_idx;
@@ -2506,7 +2506,6 @@
   lex->view_prepare_mode= TRUE;
   DBUG_ENTER("get_all_tables");
 
-  LINT_INIT(end);
   LINT_INIT(len);
 
   lex->reset_n_backup_query_tables_list(&query_tables_list_backup);
@@ -2597,7 +2596,6 @@
       else
       {
         len= build_table_filename(path, sizeof(path), base_name, "", "", 0);
-        end= path + len;
         len= FN_LEN - len;
         find_files_result res= find_files(thd, &files, base_name, 
                                           path, idx_field_vals.table_value, 0);
@@ -2647,7 +2645,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.109/mysql-test/r/show_check.result	2006-12-09 07:27:52 +04:00
+++ 1.110/mysql-test/r/show_check.result	2007-01-23 14:37:05 +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