bk commit into 5.0 tree (jimw:1.1959) BUG#12937

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1959 05/08/08 13:30:29 jimw@stripped +3 -0
  Fix incorrect 'max_rows' entry in Create_options in INFORMATION_SCHEMA.TABLES
  for INFORMATION_SCHEMA tables. (Bug #12937)

  sql/sql_show.cc
    1.263 05/08/08 13:30:26 jimw@stripped +1 -1
    Don't display max_rows for INFORMATION_SCHEMA "tables".

  mysql-test/t/information_schema.test
    1.49 05/08/08 13:30:26 jimw@stripped +8 -0
    Add new regression test

  mysql-test/r/information_schema.result
    1.70 05/08/08 13:30:26 jimw@stripped +3 -0
    Add new result

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-12397

--- 1.262/sql/sql_show.cc	2005-08-07 14:32:25 -07:00
+++ 1.263/sql/sql_show.cc	2005-08-08 13:30:26 -07:00
@@ -2292,7 +2292,7 @@
       ptr=strmov(ptr," min_rows=");
       ptr=longlong10_to_str(share->min_rows,ptr,10);
     }
-    if (share->max_rows)
+    if (share->max_rows && !tables->schema_table)
     {
       ptr=strmov(ptr," max_rows=");
       ptr=longlong10_to_str(share->max_rows,ptr,10);

--- 1.69/mysql-test/r/information_schema.result	2005-08-05 02:01:23 -07:00
+++ 1.70/mysql-test/r/information_schema.result	2005-08-08 13:30:26 -07:00
@@ -950,3 +950,6 @@
 test	tr1
 use test;
 drop table t1;
+select table_name, create_options from information_schema.tables where table_name = 'tables';
+table_name	create_options
+TABLES	

--- 1.48/mysql-test/t/information_schema.test	2005-08-02 16:26:03 -07:00
+++ 1.49/mysql-test/t/information_schema.test	2005-08-08 13:30:26 -07:00
@@ -637,3 +637,11 @@
 trigger_name='tr1';
 use test;
 drop table t1;
+
+#
+# Bug #12397: wrong values shown in column CREATE_OPTIONS of
+# INFORMATION_SCHEMA.TABLES
+#
+select table_name, create_options from information_schema.tables where table_name = 'tables';
+
+# End of 5.0 tests