MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:February 17 2009 3:49pm
Subject:bzr push into mysql-6.0-bugteam branch (Matthias.Leich:3053 to 3054)
Bug#35427
View as plain text  
 3054 Matthias Leich	2009-02-17
      Post fix for Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def
      gluh: sql/sql_show.cc
      mleich: Adjustments in tests
modified:
  mysql-test/suite/funcs_1/datadict/is_tables.inc
  mysql-test/suite/funcs_1/r/is_columns.result
  mysql-test/suite/funcs_1/r/is_tables.result
  mysql-test/suite/funcs_1/t/is_columns.test
  sql/sql_show.cc

 3053 Matthias Leich	2009-02-17
      Fix funcs_1.is_user_privileges which fails in PB
modified:
  mysql-test/suite/funcs_1/r/is_user_privileges.result
  mysql-test/suite/funcs_1/t/is_user_privileges.test

=== modified file 'mysql-test/suite/funcs_1/datadict/is_tables.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc	2009-02-17 15:47:40 +0000
@@ -43,7 +43,7 @@ eval SHOW TABLES FROM information_schema
 # Ensure that the INFORMATION_SCHEMA.TABLES table has the following columns,
 # in the following order:
 #
-# TABLE_CATALOG (always shows NULL),
+# TABLE_CATALOG (always shows 'def'),
 # TABLE_SCHEMA (shows the name of the database, or schema, in which an
 #       accessible table resides),
 # TABLE_NAME (shows the name of a table which the current user may access),
@@ -81,9 +81,10 @@ eval SHOW COLUMNS FROM information_schem
 # Note: Retrieval of information within information_schema.columns about
 #       information_schema.tables is in is_columns_is.test.
 
-# Show that TABLE_CATALOG is always NULL.
+# Show that TABLE_CATALOG is always 'def'.
 SELECT table_catalog, table_schema, table_name
-FROM information_schema.tables WHERE table_catalog IS NOT NULL;
+FROM information_schema.tables
+WHERE table_catalog IS NULL OR table_catalog <> 'def';
 
 
 --echo ################################################################################

=== modified file 'mysql-test/suite/funcs_1/r/is_columns.result'
--- a/mysql-test/suite/funcs_1/r/is_columns.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns.result	2009-02-17 15:47:40 +0000
@@ -98,661 +98,9 @@ COLUMN_COMMENT	varchar(1024)	NO
 STORAGE	varchar(8)	NO			
 FORMAT	varchar(8)	NO			
 SELECT table_catalog, table_schema, table_name, column_name
-FROM information_schema.columns WHERE table_catalog IS NOT NULL;
+FROM information_schema.columns
+WHERE table_catalog IS NULL OR table_catalog <> 'def';
 table_catalog	table_schema	table_name	column_name
-def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME
-def	information_schema	CHARACTER_SETS	DEFAULT_COLLATE_NAME
-def	information_schema	CHARACTER_SETS	DESCRIPTION
-def	information_schema	CHARACTER_SETS	MAXLEN
-def	information_schema	COLLATIONS	COLLATION_NAME
-def	information_schema	COLLATIONS	CHARACTER_SET_NAME
-def	information_schema	COLLATIONS	ID
-def	information_schema	COLLATIONS	IS_DEFAULT
-def	information_schema	COLLATIONS	IS_COMPILED
-def	information_schema	COLLATIONS	SORTLEN
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
-def	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME
-def	information_schema	COLUMNS	TABLE_CATALOG
-def	information_schema	COLUMNS	TABLE_SCHEMA
-def	information_schema	COLUMNS	TABLE_NAME
-def	information_schema	COLUMNS	COLUMN_NAME
-def	information_schema	COLUMNS	ORDINAL_POSITION
-def	information_schema	COLUMNS	COLUMN_DEFAULT
-def	information_schema	COLUMNS	IS_NULLABLE
-def	information_schema	COLUMNS	DATA_TYPE
-def	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH
-def	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH
-def	information_schema	COLUMNS	NUMERIC_PRECISION
-def	information_schema	COLUMNS	NUMERIC_SCALE
-def	information_schema	COLUMNS	CHARACTER_SET_NAME
-def	information_schema	COLUMNS	COLLATION_NAME
-def	information_schema	COLUMNS	COLUMN_TYPE
-def	information_schema	COLUMNS	COLUMN_KEY
-def	information_schema	COLUMNS	EXTRA
-def	information_schema	COLUMNS	PRIVILEGES
-def	information_schema	COLUMNS	COLUMN_COMMENT
-def	information_schema	COLUMNS	STORAGE
-def	information_schema	COLUMNS	FORMAT
-def	information_schema	COLUMN_PRIVILEGES	GRANTEE
-def	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG
-def	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA
-def	information_schema	COLUMN_PRIVILEGES	TABLE_NAME
-def	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME
-def	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE
-def	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE
-def	information_schema	ENGINES	ENGINE
-def	information_schema	ENGINES	SUPPORT
-def	information_schema	ENGINES	COMMENT
-def	information_schema	ENGINES	TRANSACTIONS
-def	information_schema	ENGINES	XA
-def	information_schema	ENGINES	SAVEPOINTS
-def	information_schema	EVENTS	EVENT_CATALOG
-def	information_schema	EVENTS	EVENT_SCHEMA
-def	information_schema	EVENTS	EVENT_NAME
-def	information_schema	EVENTS	DEFINER
-def	information_schema	EVENTS	TIME_ZONE
-def	information_schema	EVENTS	EVENT_BODY
-def	information_schema	EVENTS	EVENT_DEFINITION
-def	information_schema	EVENTS	EVENT_TYPE
-def	information_schema	EVENTS	EXECUTE_AT
-def	information_schema	EVENTS	INTERVAL_VALUE
-def	information_schema	EVENTS	INTERVAL_FIELD
-def	information_schema	EVENTS	SQL_MODE
-def	information_schema	EVENTS	STARTS
-def	information_schema	EVENTS	ENDS
-def	information_schema	EVENTS	STATUS
-def	information_schema	EVENTS	ON_COMPLETION
-def	information_schema	EVENTS	CREATED
-def	information_schema	EVENTS	LAST_ALTERED
-def	information_schema	EVENTS	LAST_EXECUTED
-def	information_schema	EVENTS	EVENT_COMMENT
-def	information_schema	EVENTS	ORIGINATOR
-def	information_schema	EVENTS	CHARACTER_SET_CLIENT
-def	information_schema	EVENTS	COLLATION_CONNECTION
-def	information_schema	EVENTS	DATABASE_COLLATION
-def	information_schema	FILES	FILE_ID
-def	information_schema	FILES	FILE_NAME
-def	information_schema	FILES	FILE_TYPE
-def	information_schema	FILES	TABLESPACE_NAME
-def	information_schema	FILES	TABLE_CATALOG
-def	information_schema	FILES	TABLE_SCHEMA
-def	information_schema	FILES	TABLE_NAME
-def	information_schema	FILES	LOGFILE_GROUP_NAME
-def	information_schema	FILES	LOGFILE_GROUP_NUMBER
-def	information_schema	FILES	ENGINE
-def	information_schema	FILES	FULLTEXT_KEYS
-def	information_schema	FILES	DELETED_ROWS
-def	information_schema	FILES	UPDATE_COUNT
-def	information_schema	FILES	FREE_EXTENTS
-def	information_schema	FILES	TOTAL_EXTENTS
-def	information_schema	FILES	EXTENT_SIZE
-def	information_schema	FILES	INITIAL_SIZE
-def	information_schema	FILES	MAXIMUM_SIZE
-def	information_schema	FILES	AUTOEXTEND_SIZE
-def	information_schema	FILES	CREATION_TIME
-def	information_schema	FILES	LAST_UPDATE_TIME
-def	information_schema	FILES	LAST_ACCESS_TIME
-def	information_schema	FILES	RECOVER_TIME
-def	information_schema	FILES	TRANSACTION_COUNTER
-def	information_schema	FILES	VERSION
-def	information_schema	FILES	ROW_FORMAT
-def	information_schema	FILES	TABLE_ROWS
-def	information_schema	FILES	AVG_ROW_LENGTH
-def	information_schema	FILES	DATA_LENGTH
-def	information_schema	FILES	MAX_DATA_LENGTH
-def	information_schema	FILES	INDEX_LENGTH
-def	information_schema	FILES	DATA_FREE
-def	information_schema	FILES	CREATE_TIME
-def	information_schema	FILES	UPDATE_TIME
-def	information_schema	FILES	CHECK_TIME
-def	information_schema	FILES	CHECKSUM
-def	information_schema	FILES	STATUS
-def	information_schema	FILES	EXTRA
-def	information_schema	GLOBAL_STATUS	VARIABLE_NAME
-def	information_schema	GLOBAL_STATUS	VARIABLE_VALUE
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME
-def	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
-def	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME
-def	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG
-def	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA
-def	information_schema	KEY_COLUMN_USAGE	TABLE_NAME
-def	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME
-def	information_schema	KEY_COLUMN_USAGE	ORDINAL_POSITION
-def	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT
-def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA
-def	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME
-def	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME
-def	information_schema	PARAMETERS	SPECIFIC_CATALOG
-def	information_schema	PARAMETERS	SPECIFIC_SCHEMA
-def	information_schema	PARAMETERS	SPECIFIC_NAME
-def	information_schema	PARAMETERS	ORDINAL_POSITION
-def	information_schema	PARAMETERS	PARAMETER_MODE
-def	information_schema	PARAMETERS	PARAMETER_NAME
-def	information_schema	PARAMETERS	DATA_TYPE
-def	information_schema	PARAMETERS	CHARACTER_MAXIMUM_LENGTH
-def	information_schema	PARAMETERS	CHARACTER_OCTET_LENGTH
-def	information_schema	PARAMETERS	NUMERIC_PRECISION
-def	information_schema	PARAMETERS	NUMERIC_SCALE
-def	information_schema	PARAMETERS	CHARACTER_SET_NAME
-def	information_schema	PARAMETERS	COLLATION_NAME
-def	information_schema	PARAMETERS	DTD_IDENTIFIER
-def	information_schema	PARAMETERS	ROUTINE_TYPE
-def	information_schema	PARTITIONS	TABLE_CATALOG
-def	information_schema	PARTITIONS	TABLE_SCHEMA
-def	information_schema	PARTITIONS	TABLE_NAME
-def	information_schema	PARTITIONS	PARTITION_NAME
-def	information_schema	PARTITIONS	SUBPARTITION_NAME
-def	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION
-def	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION
-def	information_schema	PARTITIONS	PARTITION_METHOD
-def	information_schema	PARTITIONS	SUBPARTITION_METHOD
-def	information_schema	PARTITIONS	PARTITION_EXPRESSION
-def	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION
-def	information_schema	PARTITIONS	PARTITION_DESCRIPTION
-def	information_schema	PARTITIONS	TABLE_ROWS
-def	information_schema	PARTITIONS	AVG_ROW_LENGTH
-def	information_schema	PARTITIONS	DATA_LENGTH
-def	information_schema	PARTITIONS	MAX_DATA_LENGTH
-def	information_schema	PARTITIONS	INDEX_LENGTH
-def	information_schema	PARTITIONS	DATA_FREE
-def	information_schema	PARTITIONS	CREATE_TIME
-def	information_schema	PARTITIONS	UPDATE_TIME
-def	information_schema	PARTITIONS	CHECK_TIME
-def	information_schema	PARTITIONS	CHECKSUM
-def	information_schema	PARTITIONS	PARTITION_COMMENT
-def	information_schema	PARTITIONS	NODEGROUP
-def	information_schema	PARTITIONS	TABLESPACE_NAME
-def	information_schema	PLUGINS	PLUGIN_NAME
-def	information_schema	PLUGINS	PLUGIN_VERSION
-def	information_schema	PLUGINS	PLUGIN_STATUS
-def	information_schema	PLUGINS	PLUGIN_TYPE
-def	information_schema	PLUGINS	PLUGIN_TYPE_VERSION
-def	information_schema	PLUGINS	PLUGIN_LIBRARY
-def	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION
-def	information_schema	PLUGINS	PLUGIN_AUTHOR
-def	information_schema	PLUGINS	PLUGIN_DESCRIPTION
-def	information_schema	PLUGINS	PLUGIN_LICENSE
-def	information_schema	PROCESSLIST	ID
-def	information_schema	PROCESSLIST	USER
-def	information_schema	PROCESSLIST	HOST
-def	information_schema	PROCESSLIST	DB
-def	information_schema	PROCESSLIST	COMMAND
-def	information_schema	PROCESSLIST	TIME
-def	information_schema	PROCESSLIST	STATE
-def	information_schema	PROCESSLIST	INFO
-def	information_schema	PROFILING	QUERY_ID
-def	information_schema	PROFILING	SEQ
-def	information_schema	PROFILING	STATE
-def	information_schema	PROFILING	DURATION
-def	information_schema	PROFILING	CPU_USER
-def	information_schema	PROFILING	CPU_SYSTEM
-def	information_schema	PROFILING	CONTEXT_VOLUNTARY
-def	information_schema	PROFILING	CONTEXT_INVOLUNTARY
-def	information_schema	PROFILING	BLOCK_OPS_IN
-def	information_schema	PROFILING	BLOCK_OPS_OUT
-def	information_schema	PROFILING	MESSAGES_SENT
-def	information_schema	PROFILING	MESSAGES_RECEIVED
-def	information_schema	PROFILING	PAGE_FAULTS_MAJOR
-def	information_schema	PROFILING	PAGE_FAULTS_MINOR
-def	information_schema	PROFILING	SWAPS
-def	information_schema	PROFILING	SOURCE_FUNCTION
-def	information_schema	PROFILING	SOURCE_FILE
-def	information_schema	PROFILING	SOURCE_LINE
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA
-def	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA
-def	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME
-def	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION
-def	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE
-def	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE
-def	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME
-def	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME
-def	information_schema	ROUTINES	SPECIFIC_NAME
-def	information_schema	ROUTINES	ROUTINE_CATALOG
-def	information_schema	ROUTINES	ROUTINE_SCHEMA
-def	information_schema	ROUTINES	ROUTINE_NAME
-def	information_schema	ROUTINES	ROUTINE_TYPE
-def	information_schema	ROUTINES	DATA_TYPE
-def	information_schema	ROUTINES	CHARACTER_MAXIMUM_LENGTH
-def	information_schema	ROUTINES	CHARACTER_OCTET_LENGTH
-def	information_schema	ROUTINES	NUMERIC_PRECISION
-def	information_schema	ROUTINES	NUMERIC_SCALE
-def	information_schema	ROUTINES	CHARACTER_SET_NAME
-def	information_schema	ROUTINES	COLLATION_NAME
-def	information_schema	ROUTINES	DTD_IDENTIFIER
-def	information_schema	ROUTINES	ROUTINE_BODY
-def	information_schema	ROUTINES	ROUTINE_DEFINITION
-def	information_schema	ROUTINES	EXTERNAL_NAME
-def	information_schema	ROUTINES	EXTERNAL_LANGUAGE
-def	information_schema	ROUTINES	PARAMETER_STYLE
-def	information_schema	ROUTINES	IS_DETERMINISTIC
-def	information_schema	ROUTINES	SQL_DATA_ACCESS
-def	information_schema	ROUTINES	SQL_PATH
-def	information_schema	ROUTINES	SECURITY_TYPE
-def	information_schema	ROUTINES	CREATED
-def	information_schema	ROUTINES	LAST_ALTERED
-def	information_schema	ROUTINES	SQL_MODE
-def	information_schema	ROUTINES	ROUTINE_COMMENT
-def	information_schema	ROUTINES	DEFINER
-def	information_schema	ROUTINES	CHARACTER_SET_CLIENT
-def	information_schema	ROUTINES	COLLATION_CONNECTION
-def	information_schema	ROUTINES	DATABASE_COLLATION
-def	information_schema	SCHEMATA	CATALOG_NAME
-def	information_schema	SCHEMATA	SCHEMA_NAME
-def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME
-def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME
-def	information_schema	SCHEMATA	SQL_PATH
-def	information_schema	SCHEMA_PRIVILEGES	GRANTEE
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG
-def	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA
-def	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE
-def	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE
-def	information_schema	SESSION_STATUS	VARIABLE_NAME
-def	information_schema	SESSION_STATUS	VARIABLE_VALUE
-def	information_schema	SESSION_VARIABLES	VARIABLE_NAME
-def	information_schema	SESSION_VARIABLES	VARIABLE_VALUE
-def	information_schema	STATISTICS	TABLE_CATALOG
-def	information_schema	STATISTICS	TABLE_SCHEMA
-def	information_schema	STATISTICS	TABLE_NAME
-def	information_schema	STATISTICS	NON_UNIQUE
-def	information_schema	STATISTICS	INDEX_SCHEMA
-def	information_schema	STATISTICS	INDEX_NAME
-def	information_schema	STATISTICS	SEQ_IN_INDEX
-def	information_schema	STATISTICS	COLUMN_NAME
-def	information_schema	STATISTICS	COLLATION
-def	information_schema	STATISTICS	CARDINALITY
-def	information_schema	STATISTICS	SUB_PART
-def	information_schema	STATISTICS	PACKED
-def	information_schema	STATISTICS	NULLABLE
-def	information_schema	STATISTICS	INDEX_TYPE
-def	information_schema	STATISTICS	COMMENT
-def	information_schema	STATISTICS	INDEX_COMMENT
-def	information_schema	TABLES	TABLE_CATALOG
-def	information_schema	TABLES	TABLE_SCHEMA
-def	information_schema	TABLES	TABLE_NAME
-def	information_schema	TABLES	TABLE_TYPE
-def	information_schema	TABLES	ENGINE
-def	information_schema	TABLES	VERSION
-def	information_schema	TABLES	ROW_FORMAT
-def	information_schema	TABLES	TABLE_ROWS
-def	information_schema	TABLES	AVG_ROW_LENGTH
-def	information_schema	TABLES	DATA_LENGTH
-def	information_schema	TABLES	MAX_DATA_LENGTH
-def	information_schema	TABLES	INDEX_LENGTH
-def	information_schema	TABLES	DATA_FREE
-def	information_schema	TABLES	AUTO_INCREMENT
-def	information_schema	TABLES	CREATE_TIME
-def	information_schema	TABLES	UPDATE_TIME
-def	information_schema	TABLES	CHECK_TIME
-def	information_schema	TABLES	TABLE_COLLATION
-def	information_schema	TABLES	CHECKSUM
-def	information_schema	TABLES	CREATE_OPTIONS
-def	information_schema	TABLES	TABLE_COMMENT
-def	information_schema	TABLES	TABLESPACE_NAME
-def	information_schema	TABLESPACES	TABLESPACE_NAME
-def	information_schema	TABLESPACES	ENGINE
-def	information_schema	TABLESPACES	TABLESPACE_TYPE
-def	information_schema	TABLESPACES	LOGFILE_GROUP_NAME
-def	information_schema	TABLESPACES	EXTENT_SIZE
-def	information_schema	TABLESPACES	AUTOEXTEND_SIZE
-def	information_schema	TABLESPACES	MAXIMUM_SIZE
-def	information_schema	TABLESPACES	NODEGROUP_ID
-def	information_schema	TABLESPACES	TABLESPACE_COMMENT
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME
-def	information_schema	TABLE_CONSTRAINTS	TABLE_SCHEMA
-def	information_schema	TABLE_CONSTRAINTS	TABLE_NAME
-def	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_TYPE
-def	information_schema	TABLE_PRIVILEGES	GRANTEE
-def	information_schema	TABLE_PRIVILEGES	TABLE_CATALOG
-def	information_schema	TABLE_PRIVILEGES	TABLE_SCHEMA
-def	information_schema	TABLE_PRIVILEGES	TABLE_NAME
-def	information_schema	TABLE_PRIVILEGES	PRIVILEGE_TYPE
-def	information_schema	TABLE_PRIVILEGES	IS_GRANTABLE
-def	information_schema	TRIGGERS	TRIGGER_CATALOG
-def	information_schema	TRIGGERS	TRIGGER_SCHEMA
-def	information_schema	TRIGGERS	TRIGGER_NAME
-def	information_schema	TRIGGERS	EVENT_MANIPULATION
-def	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG
-def	information_schema	TRIGGERS	EVENT_OBJECT_SCHEMA
-def	information_schema	TRIGGERS	EVENT_OBJECT_TABLE
-def	information_schema	TRIGGERS	ACTION_ORDER
-def	information_schema	TRIGGERS	ACTION_CONDITION
-def	information_schema	TRIGGERS	ACTION_STATEMENT
-def	information_schema	TRIGGERS	ACTION_ORIENTATION
-def	information_schema	TRIGGERS	ACTION_TIMING
-def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE
-def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_TABLE
-def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW
-def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW
-def	information_schema	TRIGGERS	CREATED
-def	information_schema	TRIGGERS	SQL_MODE
-def	information_schema	TRIGGERS	DEFINER
-def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT
-def	information_schema	TRIGGERS	COLLATION_CONNECTION
-def	information_schema	TRIGGERS	DATABASE_COLLATION
-def	information_schema	USER_PRIVILEGES	GRANTEE
-def	information_schema	USER_PRIVILEGES	TABLE_CATALOG
-def	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE
-def	information_schema	USER_PRIVILEGES	IS_GRANTABLE
-def	information_schema	VIEWS	TABLE_CATALOG
-def	information_schema	VIEWS	TABLE_SCHEMA
-def	information_schema	VIEWS	TABLE_NAME
-def	information_schema	VIEWS	VIEW_DEFINITION
-def	information_schema	VIEWS	CHECK_OPTION
-def	information_schema	VIEWS	IS_UPDATABLE
-def	information_schema	VIEWS	DEFINER
-def	information_schema	VIEWS	SECURITY_TYPE
-def	information_schema	VIEWS	CHARACTER_SET_CLIENT
-def	information_schema	VIEWS	COLLATION_CONNECTION
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	FREE_SPACE
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	FREE_SEGMENTS
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	BIG_HUNKS
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	SMALL_HUNKS
-def	information_schema	FALCON_RECORD_CACHE_SUMMARY	UNIQUE_SIZES
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	FILE
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	LINE
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	OBJECTS_IN_USE
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	SPACE_IN_USE
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	OBJECTS_DELETED
-def	information_schema	FALCON_SYSTEM_MEMORY_DETAIL	SPACE_DELETED
-def	information_schema	FALCON_TABLESPACE_IO	TABLESPACE
-def	information_schema	FALCON_TABLESPACE_IO	PAGE_SIZE
-def	information_schema	FALCON_TABLESPACE_IO	BUFFERS
-def	information_schema	FALCON_TABLESPACE_IO	PHYSICAL_READS
-def	information_schema	FALCON_TABLESPACE_IO	WRITES
-def	information_schema	FALCON_TABLESPACE_IO	LOGICAL_READS
-def	information_schema	FALCON_TABLESPACE_IO	FAKES
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	TOTAL_SPACE
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	FREE_SPACE
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	FREE_SEGMENTS
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	BIG_HUNKS
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	SMALL_HUNKS
-def	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY	UNIQUE_SIZES
-def	information_schema	FALCON_VERSION	Version
-def	information_schema	FALCON_VERSION	Date
-def	information_schema	FALCON_TRANSACTION_SUMMARY	COMMITTED
-def	information_schema	FALCON_TRANSACTION_SUMMARY	ROLLED_BACK
-def	information_schema	FALCON_TRANSACTION_SUMMARY	ACTIVE
-def	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMMIT
-def	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMPLETION
-def	information_schema	FALCON_SERIAL_LOG_INFO	TRANSACTIONS
-def	information_schema	FALCON_SERIAL_LOG_INFO	BLOCKS
-def	information_schema	FALCON_SERIAL_LOG_INFO	WINDOWS
-def	information_schema	FALCON_SERIAL_LOG_INFO	BUFFERS
-def	information_schema	FALCON_SYNCOBJECTS	CALLER
-def	information_schema	FALCON_SYNCOBJECTS	SHARED
-def	information_schema	FALCON_SYNCOBJECTS	EXCLUSIVE
-def	information_schema	FALCON_SYNCOBJECTS	WAITS
-def	information_schema	FALCON_SYNCOBJECTS	QUEUE_LENGTH
-def	information_schema	FALCON_TRANSACTIONS	STATE
-def	information_schema	FALCON_TRANSACTIONS	THREAD_ID
-def	information_schema	FALCON_TRANSACTIONS	ID
-def	information_schema	FALCON_TRANSACTIONS	UPDATES
-def	information_schema	FALCON_TRANSACTIONS	PENDING
-def	information_schema	FALCON_TRANSACTIONS	DEP
-def	information_schema	FALCON_TRANSACTIONS	OLDEST
-def	information_schema	FALCON_TRANSACTIONS	RECORDS
-def	information_schema	FALCON_TRANSACTIONS	WAITING_FOR
-def	information_schema	FALCON_TRANSACTIONS	STATEMENT
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	FILE
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	LINE
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	OBJECTS_IN_USE
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	SPACE_IN_USE
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	OBJECTS_DELETED
-def	information_schema	FALCON_RECORD_CACHE_DETAIL	SPACE_DELETED
-def	mtr	global_suppressions	pattern
-def	mtr	test_suppressions	pattern
-def	mysql	backup_history	backup_id
-def	mysql	backup_history	process_id
-def	mysql	backup_history	binlog_pos
-def	mysql	backup_history	binlog_file
-def	mysql	backup_history	backup_state
-def	mysql	backup_history	operation
-def	mysql	backup_history	error_num
-def	mysql	backup_history	num_objects
-def	mysql	backup_history	total_bytes
-def	mysql	backup_history	validity_point_time
-def	mysql	backup_history	start_time
-def	mysql	backup_history	stop_time
-def	mysql	backup_history	host_or_server_name
-def	mysql	backup_history	username
-def	mysql	backup_history	backup_file
-def	mysql	backup_history	backup_file_path
-def	mysql	backup_history	user_comment
-def	mysql	backup_history	command
-def	mysql	backup_history	drivers
-def	mysql	backup_progress	backup_id
-def	mysql	backup_progress	object
-def	mysql	backup_progress	start_time
-def	mysql	backup_progress	stop_time
-def	mysql	backup_progress	total_bytes
-def	mysql	backup_progress	progress
-def	mysql	backup_progress	error_num
-def	mysql	backup_progress	notes
-def	mysql	columns_priv	Host
-def	mysql	columns_priv	Db
-def	mysql	columns_priv	User
-def	mysql	columns_priv	Table_name
-def	mysql	columns_priv	Column_name
-def	mysql	columns_priv	Timestamp
-def	mysql	columns_priv	Column_priv
-def	mysql	db	Host
-def	mysql	db	Db
-def	mysql	db	User
-def	mysql	db	Select_priv
-def	mysql	db	Insert_priv
-def	mysql	db	Update_priv
-def	mysql	db	Delete_priv
-def	mysql	db	Create_priv
-def	mysql	db	Drop_priv
-def	mysql	db	Grant_priv
-def	mysql	db	References_priv
-def	mysql	db	Index_priv
-def	mysql	db	Alter_priv
-def	mysql	db	Create_tmp_table_priv
-def	mysql	db	Lock_tables_priv
-def	mysql	db	Create_view_priv
-def	mysql	db	Show_view_priv
-def	mysql	db	Create_routine_priv
-def	mysql	db	Alter_routine_priv
-def	mysql	db	Execute_priv
-def	mysql	db	Event_priv
-def	mysql	db	Trigger_priv
-def	mysql	event	db
-def	mysql	event	name
-def	mysql	event	body
-def	mysql	event	definer
-def	mysql	event	execute_at
-def	mysql	event	interval_value
-def	mysql	event	interval_field
-def	mysql	event	created
-def	mysql	event	modified
-def	mysql	event	last_executed
-def	mysql	event	starts
-def	mysql	event	ends
-def	mysql	event	status
-def	mysql	event	on_completion
-def	mysql	event	sql_mode
-def	mysql	event	comment
-def	mysql	event	originator
-def	mysql	event	time_zone
-def	mysql	event	character_set_client
-def	mysql	event	collation_connection
-def	mysql	event	db_collation
-def	mysql	event	body_utf8
-def	mysql	func	name
-def	mysql	func	ret
-def	mysql	func	dl
-def	mysql	func	type
-def	mysql	general_log	event_time
-def	mysql	general_log	user_host
-def	mysql	general_log	thread_id
-def	mysql	general_log	server_id
-def	mysql	general_log	command_type
-def	mysql	general_log	argument
-def	mysql	help_category	help_category_id
-def	mysql	help_category	name
-def	mysql	help_category	parent_category_id
-def	mysql	help_category	url
-def	mysql	help_keyword	help_keyword_id
-def	mysql	help_keyword	name
-def	mysql	help_relation	help_topic_id
-def	mysql	help_relation	help_keyword_id
-def	mysql	help_topic	help_topic_id
-def	mysql	help_topic	name
-def	mysql	help_topic	help_category_id
-def	mysql	help_topic	description
-def	mysql	help_topic	example
-def	mysql	help_topic	url
-def	mysql	host	Host
-def	mysql	host	Db
-def	mysql	host	Select_priv
-def	mysql	host	Insert_priv
-def	mysql	host	Update_priv
-def	mysql	host	Delete_priv
-def	mysql	host	Create_priv
-def	mysql	host	Drop_priv
-def	mysql	host	Grant_priv
-def	mysql	host	References_priv
-def	mysql	host	Index_priv
-def	mysql	host	Alter_priv
-def	mysql	host	Create_tmp_table_priv
-def	mysql	host	Lock_tables_priv
-def	mysql	host	Create_view_priv
-def	mysql	host	Show_view_priv
-def	mysql	host	Create_routine_priv
-def	mysql	host	Alter_routine_priv
-def	mysql	host	Execute_priv
-def	mysql	host	Trigger_priv
-def	mysql	ndb_binlog_index	Position
-def	mysql	ndb_binlog_index	File
-def	mysql	ndb_binlog_index	epoch
-def	mysql	ndb_binlog_index	inserts
-def	mysql	ndb_binlog_index	updates
-def	mysql	ndb_binlog_index	deletes
-def	mysql	ndb_binlog_index	schemaops
-def	mysql	ndb_binlog_index	orig_server_id
-def	mysql	ndb_binlog_index	orig_epoch
-def	mysql	ndb_binlog_index	gci
-def	mysql	plugin	name
-def	mysql	plugin	dl
-def	mysql	proc	db
-def	mysql	proc	name
-def	mysql	proc	type
-def	mysql	proc	specific_name
-def	mysql	proc	language
-def	mysql	proc	sql_data_access
-def	mysql	proc	is_deterministic
-def	mysql	proc	security_type
-def	mysql	proc	param_list
-def	mysql	proc	returns
-def	mysql	proc	body
-def	mysql	proc	definer
-def	mysql	proc	created
-def	mysql	proc	modified
-def	mysql	proc	sql_mode
-def	mysql	proc	comment
-def	mysql	proc	character_set_client
-def	mysql	proc	collation_connection
-def	mysql	proc	db_collation
-def	mysql	proc	body_utf8
-def	mysql	procs_priv	Host
-def	mysql	procs_priv	Db
-def	mysql	procs_priv	User
-def	mysql	procs_priv	Routine_name
-def	mysql	procs_priv	Routine_type
-def	mysql	procs_priv	Grantor
-def	mysql	procs_priv	Proc_priv
-def	mysql	procs_priv	Timestamp
-def	mysql	servers	Server_name
-def	mysql	servers	Host
-def	mysql	servers	Db
-def	mysql	servers	Username
-def	mysql	servers	Password
-def	mysql	servers	Port
-def	mysql	servers	Socket
-def	mysql	servers	Wrapper
-def	mysql	servers	Owner
-def	mysql	slow_log	start_time
-def	mysql	slow_log	user_host
-def	mysql	slow_log	query_time
-def	mysql	slow_log	lock_time
-def	mysql	slow_log	rows_sent
-def	mysql	slow_log	rows_examined
-def	mysql	slow_log	db
-def	mysql	slow_log	last_insert_id
-def	mysql	slow_log	insert_id
-def	mysql	slow_log	server_id
-def	mysql	slow_log	sql_text
-def	mysql	tables_priv	Host
-def	mysql	tables_priv	Db
-def	mysql	tables_priv	User
-def	mysql	tables_priv	Table_name
-def	mysql	tables_priv	Grantor
-def	mysql	tables_priv	Timestamp
-def	mysql	tables_priv	Table_priv
-def	mysql	tables_priv	Column_priv
-def	mysql	time_zone	Time_zone_id
-def	mysql	time_zone	Use_leap_seconds
-def	mysql	time_zone_leap_second	Transition_time
-def	mysql	time_zone_leap_second	Correction
-def	mysql	time_zone_name	Name
-def	mysql	time_zone_name	Time_zone_id
-def	mysql	time_zone_transition	Time_zone_id
-def	mysql	time_zone_transition	Transition_time
-def	mysql	time_zone_transition	Transition_type_id
-def	mysql	time_zone_transition_type	Time_zone_id
-def	mysql	time_zone_transition_type	Transition_type_id
-def	mysql	time_zone_transition_type	Offset
-def	mysql	time_zone_transition_type	Is_DST
-def	mysql	time_zone_transition_type	Abbreviation
-def	mysql	user	Host
-def	mysql	user	User
-def	mysql	user	Password
-def	mysql	user	Select_priv
-def	mysql	user	Insert_priv
-def	mysql	user	Update_priv
-def	mysql	user	Delete_priv
-def	mysql	user	Create_priv
-def	mysql	user	Drop_priv
-def	mysql	user	Reload_priv
-def	mysql	user	Shutdown_priv
-def	mysql	user	Process_priv
-def	mysql	user	File_priv
-def	mysql	user	Grant_priv
-def	mysql	user	References_priv
-def	mysql	user	Index_priv
-def	mysql	user	Alter_priv
-def	mysql	user	Show_db_priv
-def	mysql	user	Super_priv
-def	mysql	user	Create_tmp_table_priv
-def	mysql	user	Lock_tables_priv
-def	mysql	user	Execute_priv
-def	mysql	user	Repl_slave_priv
-def	mysql	user	Repl_client_priv
-def	mysql	user	Create_view_priv
-def	mysql	user	Show_view_priv
-def	mysql	user	Create_routine_priv
-def	mysql	user	Alter_routine_priv
-def	mysql	user	Create_user_priv
-def	mysql	user	Event_priv
-def	mysql	user	Trigger_priv
-def	mysql	user	Create_tablespace_priv
-def	mysql	user	ssl_type
-def	mysql	user	ssl_cipher
-def	mysql	user	x509_issuer
-def	mysql	user	x509_subject
-def	mysql	user	max_questions
-def	mysql	user	max_updates
-def	mysql	user	max_connections
-def	mysql	user	max_user_connections
 ###############################################################################
 # Testcase 3.2.6.2 + 3.2.6.3: INFORMATION_SCHEMA.COLUMNS accessible information
 ###############################################################################

=== modified file 'mysql-test/suite/funcs_1/r/is_tables.result'
--- a/mysql-test/suite/funcs_1/r/is_tables.result	2009-02-16 14:47:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables.result	2009-02-17 15:47:40 +0000
@@ -101,75 +101,9 @@ CREATE_OPTIONS	varchar(255)	YES		NULL
 TABLE_COMMENT	varchar(2048)	NO			
 TABLESPACE_NAME	varchar(64)	YES		NULL	
 SELECT table_catalog, table_schema, table_name
-FROM information_schema.tables WHERE table_catalog IS NOT NULL;
+FROM information_schema.tables
+WHERE table_catalog IS NULL OR table_catalog <> 'def';
 table_catalog	table_schema	table_name
-	information_schema	CHARACTER_SETS
-	information_schema	COLLATIONS
-	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY
-	information_schema	COLUMNS
-	information_schema	COLUMN_PRIVILEGES
-	information_schema	ENGINES
-	information_schema	EVENTS
-	information_schema	FILES
-	information_schema	GLOBAL_STATUS
-	information_schema	GLOBAL_VARIABLES
-	information_schema	KEY_COLUMN_USAGE
-	information_schema	PARAMETERS
-	information_schema	PARTITIONS
-	information_schema	PLUGINS
-	information_schema	PROCESSLIST
-	information_schema	PROFILING
-	information_schema	REFERENTIAL_CONSTRAINTS
-	information_schema	ROUTINES
-	information_schema	SCHEMATA
-	information_schema	SCHEMA_PRIVILEGES
-	information_schema	SESSION_STATUS
-	information_schema	SESSION_VARIABLES
-	information_schema	STATISTICS
-	information_schema	TABLES
-	information_schema	TABLESPACES
-	information_schema	TABLE_CONSTRAINTS
-	information_schema	TABLE_PRIVILEGES
-	information_schema	TRIGGERS
-	information_schema	USER_PRIVILEGES
-	information_schema	VIEWS
-	information_schema	FALCON_RECORD_CACHE_SUMMARY
-	information_schema	FALCON_SYSTEM_MEMORY_DETAIL
-	information_schema	FALCON_TABLESPACE_IO
-	information_schema	FALCON_SYSTEM_MEMORY_SUMMARY
-	information_schema	FALCON_VERSION
-	information_schema	FALCON_TRANSACTION_SUMMARY
-	information_schema	FALCON_SERIAL_LOG_INFO
-	information_schema	FALCON_SYNCOBJECTS
-	information_schema	FALCON_TRANSACTIONS
-	information_schema	FALCON_RECORD_CACHE_DETAIL
-	mtr	global_suppressions
-	mtr	test_suppressions
-	mysql	backup_history
-	mysql	backup_progress
-	mysql	columns_priv
-	mysql	db
-	mysql	event
-	mysql	func
-	mysql	general_log
-	mysql	help_category
-	mysql	help_keyword
-	mysql	help_relation
-	mysql	help_topic
-	mysql	host
-	mysql	ndb_binlog_index
-	mysql	plugin
-	mysql	proc
-	mysql	procs_priv
-	mysql	servers
-	mysql	slow_log
-	mysql	tables_priv
-	mysql	time_zone
-	mysql	time_zone_leap_second
-	mysql	time_zone_name
-	mysql	time_zone_transition
-	mysql	time_zone_transition_type
-	mysql	user
 ################################################################################
 # Testcase 3.2.12.2 + 3.2.12.3: INFORMATION_SCHEMA.TABLES accessible information
 ################################################################################

=== modified file 'mysql-test/suite/funcs_1/t/is_columns.test'
--- a/mysql-test/suite/funcs_1/t/is_columns.test	2009-02-01 17:21:10 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns.test	2009-02-17 15:47:40 +0000
@@ -88,9 +88,10 @@ eval SHOW COLUMNS FROM information_schem
 # Note: Retrieval of information within information_schema.columns about
 #       information_schema.columns is in is_columns_is.test.
 
-# Show that TABLE_CATALOG is always NULL.
+# Show that TABLE_CATALOG is always 'def'.
 SELECT table_catalog, table_schema, table_name, column_name
-FROM information_schema.columns WHERE table_catalog IS NOT NULL;
+FROM information_schema.columns
+WHERE table_catalog IS NULL OR table_catalog <> 'def';
 
 
 --echo ###############################################################################

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2009-02-16 14:47:53 +0000
+++ b/sql/sql_show.cc	2009-02-17 15:47:40 +0000
@@ -3434,6 +3434,7 @@ int get_all_tables(THD *thd, TABLE_LIST
               (!lookup_field_vals.table_value.length ||
                lookup_field_vals.wild_table_value))
           {
+            table->field[0]->store(STRING_WITH_LEN("def"), system_charset_info);
             if (schema_table_store_record(thd, table))
               goto err;      /* Out of space in temporary table */
             continue;

Thread
bzr push into mysql-6.0-bugteam branch (Matthias.Leich:3053 to 3054)Bug#35427Matthias Leich17 Feb