Commit 1b04234e authored Mar 25, 2005 by unknown

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

parents 5f6e61ae 2ec4480e

mysql-test/r/information_schema.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -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";

sql/sql_show.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -979,7 +979,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);