From 2ec4480e8cbbad84634a767c76aa8a5f09e6861a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Mar 2005 12:19:11 +0300 Subject: [PATCH] Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.* -skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables mysql-test/r/information_schema.result: Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.* sql/sql_show.cc: Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.* --- mysql-test/r/information_schema.result | 4 ++-- sql/sql_show.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 1c3525c1508..be9ea7eadd1 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -441,7 +441,7 @@ character_sets CREATE TEMPORARY TABLE `character_sets` ( `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '', `DESCRIPTION` varchar(60) NOT NULL default '', `MAXLEN` bigint(3) NOT NULL default '0' -) ENGINE=MEMORY DEFAULT CHARSET=utf8 MAX_ROWS=1818 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 set names latin2; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; Table Create Table @@ -450,7 +450,7 @@ character_sets CREATE TEMPORARY TABLE `character_sets` ( `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '', `DESCRIPTION` varchar(60) NOT NULL default '', `MAXLEN` bigint(3) NOT NULL default '0' -) ENGINE=MEMORY DEFAULT CHARSET=utf8 MAX_ROWS=1818 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 set names latin1; create table t1 select * from information_schema.CHARACTER_SETS where CHARACTER_SET_NAME like "latin1"; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 9f7aaa70a09..3d83c5fe448 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -978,7 +978,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet) packet->append(buff, (uint) (end- buff)); } - if (share->max_rows) + if (share->max_rows && !table_list->schema_table) { packet->append(" MAX_ROWS=", 10); end= longlong10_to_str(share->max_rows, buff, 10);