Commit 9e1ead5a authored by unknown's avatar unknown
Browse files

Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp & 

        bug #7215: information_schema: columns are longtext instead of varchar
parent 8f62bf27

mysql-test/r/count_distinct2.result

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ count(distinct n) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	2

Created_tmp_disk_tables	1

drop table t1;

create table t1 (s text);

flush status;
@@ -125,5 +125,5 @@ count(distinct s) 
5000

show status like 'Created_tmp_disk_tables';

Variable_name	Value

Created_tmp_disk_tables	2

Created_tmp_disk_tables	1

drop table t1;

mysql-test/r/information_schema.result

+18 −2
Original line number Diff line number Diff line
@@ -494,8 +494,8 @@ select TABLE_NAME,TABLE_TYPE,ENGINE 
from information_schema.tables 

where table_schema='information_schema' limit 2;

TABLE_NAME	TABLE_TYPE	ENGINE

SCHEMATA	TEMPORARY	MyISAM

TABLES	TEMPORARY	MyISAM

SCHEMATA	TEMPORARY	MEMORY

TABLES	TEMPORARY	MEMORY

show tables from information_schema like "T%";

Tables_in_information_schema (T%)

TABLES
@@ -615,3 +615,19 @@ CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; 
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;

drop view a2, a1;

drop table t_crashme;

select table_schema,table_name, column_name from

information_schema.columns 

where data_type = 'longtext';

table_schema	table_name	column_name

information_schema	COLUMNS	COLUMN_TYPE

information_schema	ROUTINES	ROUTINE_DEFINITION

information_schema	ROUTINES	SQL_MODE

information_schema	VIEWS	VIEW_DEFINITION

select table_name, column_name, data_type from information_schema.columns

where data_type = 'datetime';

table_name	column_name	data_type

TABLES	CREATE_TIME	datetime

TABLES	UPDATE_TIME	datetime

TABLES	CHECK_TIME	datetime

ROUTINES	CREATED	datetime

ROUTINES	LAST_ALTERED	datetime

mysql-test/r/temp_table.result

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,6 @@ d 
2002-10-24 14:50:40

show status like "created_tmp%tables";

Variable_name	Value

Created_tmp_disk_tables	1

Created_tmp_disk_tables	0

Created_tmp_tables	2

drop table t1;

mysql-test/t/information_schema.test

+10 −0
Original line number Diff line number Diff line
@@ -390,3 +390,13 @@ while ($tab_count) 
--enable_query_log

drop view a2, a1;

drop table t_crashme;



#

# Bug #7215  information_schema: columns are longtext instead of varchar

# Bug #7217  information_schema: columns are varbinary() instead of timestamp

#

select table_schema,table_name, column_name from

information_schema.columns 

where data_type = 'longtext';

select table_name, column_name, data_type from information_schema.columns

where data_type = 'datetime';

sql/sql_class.h

+3 −1
Original line number Diff line number Diff line
@@ -1613,10 +1613,12 @@ class TMP_TABLE_PARAM :public Sql_alloc 
  /* If >0 convert all blob fields to varchar(convert_blob_length) */

  uint  convert_blob_length; 

  CHARSET_INFO *table_charset; 

  bool schema_table;



  TMP_TABLE_PARAM()

    :copy_field(0), group_parts(0),

    group_length(0), group_null_parts(0), convert_blob_length(0)

    group_length(0), group_null_parts(0), convert_blob_length(0),

    schema_table(0)

  {}

  ~TMP_TABLE_PARAM()

  {