bk commit into 5.1 tree (gluh:1.2586) BUG#31381

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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@stripped, 2007-10-17 14:08:03+05:00, gluh@stripped +3 -0
  Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
  move 'table_collation' field filling outside of if(file) condition
  because this field has 'OPEN_FRM_ONLY' attribute

  mysql-test/r/information_schema.result@stripped, 2007-10-17 14:08:01+05:00, gluh@stripped
+4 -0
    test result

  mysql-test/t/information_schema.test@stripped, 2007-10-17 14:08:01+05:00, gluh@stripped +6
-0
    test case

  sql/sql_show.cc@stripped, 2007-10-17 14:08:01+05:00, gluh@stripped +4 -3
    move 'table_collation' field filling outside of if(file) condition
    because this field has 'OPEN_FRM_ONLY' attribute

diff -Nrup a/mysql-test/r/information_schema.result
b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2007-10-05 12:32:27 +05:00
+++ b/mysql-test/r/information_schema.result	2007-10-17 14:08:01 +05:00
@@ -1560,4 +1560,8 @@ SELECT SCHEMA_NAME FROM INFORMATION_SCHE
 WHERE SCHEMA_NAME ='information_schema';
 SCHEMA_NAME
 information_schema
+SELECT TABLE_COLLATION FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
+TABLE_COLLATION
+utf8_bin
 End of 5.1 tests.
diff -Nrup a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
--- a/mysql-test/t/information_schema.test	2007-10-05 12:32:27 +05:00
+++ b/mysql-test/t/information_schema.test	2007-10-17 14:08:01 +05:00
@@ -1201,5 +1201,11 @@ DROP VIEW v1;
 #
 SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
 WHERE SCHEMA_NAME ='information_schema';
+                                                                                         
       
+#
+# Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
+#
+SELECT TABLE_COLLATION FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
 
 --echo End of 5.1 tests.
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-09-28 17:33:29 +05:00
+++ b/sql/sql_show.cc	2007-10-17 14:08:01 +05:00
@@ -3487,6 +3487,10 @@ static int get_schema_tables_record(THD 
                             (ptr == option_buff ? 0 : 
                              (uint) (ptr-option_buff)-1), cs);
 
+    tmp_buff= (share->table_charset ?
+               share->table_charset->name : "default");
+    table->field[17]->store(tmp_buff, strlen(tmp_buff), cs);
+
     if (share->comment.str)
       table->field[20]->store(share->comment.str, share->comment.length, cs);
 
@@ -3564,9 +3568,6 @@ static int get_schema_tables_record(THD 
         table->field[16]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
         table->field[16]->set_notnull();
       }
-      tmp_buff= (share->table_charset ?
-                 share->table_charset->name : "default");
-      table->field[17]->store(tmp_buff, strlen(tmp_buff), cs);
       if (file->ha_table_flags() & (ulong) HA_HAS_CHECKSUM)
       {
         table->field[18]->store((longlong) file->checksum(), TRUE);