[Commits] Rev 3807: MDEV-4786 - merge 10.0-monty - 10.0 in lp:~maria-captains/maria/10.0-serg

Sergey Vojtovich svoj at mariadb.org
Thu Aug 1 15:04:18 EEST 2013


At lp:~maria-captains/maria/10.0-serg

------------------------------------------------------------
revno: 3807
revision-id: svoj at mariadb.org-20130801120413-ldyr9of2zs64ef61
parent: svoj at mariadb.org-20130801120050-cc3sf2bvunn02dfw
committer: Sergey Vojtovich <svoj at mariadb.org>
branch nick: 10.0-serg
timestamp: Thu 2013-08-01 16:04:13 +0400
message:
  MDEV-4786 - merge 10.0-monty - 10.0
  
  Fixed funcs_1.is_statistics_mysql_embedded, funcs_1.is_columns_mysql_embedded,
  funcs_1.is_table_constraints_mysql_embedded, funcs_1.is_tables_mysql_embedded
  failures.
  
  mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
    Applied same changes as to non-embedded counterpart.
  mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result:
    Applied same changes as to non-embedded counterpart.
  mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result:
    Applied same changes as to non-embedded counterpart.
  mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
    Applied same changes as to non-embedded counterpart.
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2013-07-18 14:46:57 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2013-08-01 12:04:13 +0000
@@ -72,7 +72,7 @@ def	mysql	general_log	argument	6	NULL	NO
 def	mysql	general_log	command_type	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	mysql	general_log	event_time	1	CURRENT_TIMESTAMP(6)	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)		on update CURRENT_TIMESTAMP		
 def	mysql	general_log	server_id	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				
-def	mysql	general_log	thread_id	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
+def	mysql	general_log	thread_id	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned				
 def	mysql	general_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	NULL	utf8	utf8_general_ci	mediumtext				
 def	mysql	gtid_slave_pos	domain_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI			
 def	mysql	gtid_slave_pos	seq_no	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
@@ -117,13 +117,6 @@ def	mysql	index_stats	db_name	1	NULL	NO
 def	mysql	index_stats	index_name	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI			
 def	mysql	index_stats	prefix_arity	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned	PRI			
 def	mysql	index_stats	table_name	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI			
-def	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI			
-def	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)				
-def	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
 def	mysql	plugin	dl	2		NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)				
 def	mysql	plugin	name	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)	PRI			
 def	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	NULL	longblob				
@@ -170,50 +163,6 @@ def	mysql	servers	Server_name	1		NO	char
 def	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)				
 def	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)				
 def	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)				
-def	mysql	slave_master_info	Bind	18	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				Displays which interface is employed when connecting to the MySQL server
-def	mysql	slave_master_info	Connect_retry	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				The period (in seconds) that the slave will wait before trying to reconnect to the master.
-def	mysql	slave_master_info	Enabled_ssl	10	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)				Indicates whether the server supports SSL connections.
-def	mysql	slave_master_info	Heartbeat	17	NULL	NO	float	NULL	NULL	12	NULL	NULL	NULL	NULL	float				
-def	mysql	slave_master_info	Host	5	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The host name of the master.
-def	mysql	slave_master_info	Ignored_server_ids	19	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The number of server IDs to be ignored, followed by the actual server IDs
-def	mysql	slave_master_info	Master_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI			
-def	mysql	slave_master_info	Master_log_name	3	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the master binary log currently being read from the master.
-def	mysql	slave_master_info	Master_log_pos	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				The master log position of the last read event.
-def	mysql	slave_master_info	Number_of_lines	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				Number of lines in the file.
-def	mysql	slave_master_info	Port	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				The network port used to connect to the master.
-def	mysql	slave_master_info	Retry_count	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				Number of reconnect attempts, to the master, before giving up.
-def	mysql	slave_master_info	Ssl_ca	11	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The file used for the Certificate Authority (CA) certificate.
-def	mysql	slave_master_info	Ssl_capath	12	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The path to the Certificate Authority (CA) certificates.
-def	mysql	slave_master_info	Ssl_cert	13	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the SSL certificate file.
-def	mysql	slave_master_info	Ssl_cipher	14	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the cipher in use for the SSL connection.
-def	mysql	slave_master_info	Ssl_crl	22	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The file used for the Certificate Revocation List (CRL)
-def	mysql	slave_master_info	Ssl_crlpath	23	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The path used for Certificate Revocation List (CRL) files
-def	mysql	slave_master_info	Ssl_key	15	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the SSL key file.
-def	mysql	slave_master_info	Ssl_verify_server_cert	16	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	NULL	tinyint(1)				Whether to verify the server certificate.
-def	mysql	slave_master_info	User_name	6	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The user name used to connect to the master.
-def	mysql	slave_master_info	User_password	7	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The password used to connect to the master.
-def	mysql	slave_master_info	Uuid	20	NULL	YES	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The master server uuid.
-def	mysql	slave_relay_log_info	Master_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI			
-def	mysql	slave_relay_log_info	Master_log_name	5	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the master binary log file from which the events in the relay log file were read.
-def	mysql	slave_relay_log_info	Master_log_pos	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				The master log position of the last executed event.
-def	mysql	slave_relay_log_info	Number_of_lines	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				Number of lines in the file or rows in the table. Used to version table definitions.
-def	mysql	slave_relay_log_info	Number_of_workers	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				
-def	mysql	slave_relay_log_info	Relay_log_name	3	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				The name of the current relay log file.
-def	mysql	slave_relay_log_info	Relay_log_pos	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				The relay log position of the last executed event.
-def	mysql	slave_relay_log_info	Sql_delay	7	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				The number of seconds that the slave must lag behind the master.
-def	mysql	slave_worker_info	Checkpoint_group_bitmap	13	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	NULL	blob				
-def	mysql	slave_worker_info	Checkpoint_group_size	12	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				
-def	mysql	slave_worker_info	Checkpoint_master_log_name	9	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				
-def	mysql	slave_worker_info	Checkpoint_master_log_pos	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	slave_worker_info	Checkpoint_relay_log_name	7	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				
-def	mysql	slave_worker_info	Checkpoint_relay_log_pos	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	slave_worker_info	Checkpoint_seqno	11	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				
-def	mysql	slave_worker_info	Master_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI			
-def	mysql	slave_worker_info	Master_log_name	5	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				
-def	mysql	slave_worker_info	Master_log_pos	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	slave_worker_info	Relay_log_name	3	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_bin	text				
-def	mysql	slave_worker_info	Relay_log_pos	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned				
-def	mysql	slave_worker_info	Worker_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI			
 def	mysql	slow_log	db	7	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)				
 def	mysql	slow_log	insert_id	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
 def	mysql	slow_log	last_insert_id	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
@@ -224,6 +173,7 @@ def	mysql	slow_log	rows_sent	5	NULL	NO	i
 def	mysql	slow_log	server_id	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned				
 def	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	NULL	utf8	utf8_general_ci	mediumtext				
 def	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP(6)	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)		on update CURRENT_TIMESTAMP		
+def	mysql	slow_log	thread_id	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned				
 def	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	NULL	utf8	utf8_general_ci	mediumtext				
 def	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')				
 def	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)	PRI			
@@ -274,6 +224,7 @@ def	mysql	user	max_questions	37	0	NO	int
 def	mysql	user	max_updates	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11) unsigned				
 def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)				
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	NULL	latin1	latin1_bin	char(41)				
+def	mysql	user	password_expired	43	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	plugin	41		NO	char	64	64	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(64)				
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
@@ -310,7 +261,6 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COL
 1.0000	varbinary	NULL	NULL
 1.0000	char	latin1	latin1_bin
 1.0000	char	latin1	latin1_swedish_ci
-1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	text	utf8	utf8_bin
 1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
@@ -344,7 +294,6 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COL
 NULL	bigint	NULL	NULL
 NULL	datetime	NULL	NULL
 NULL	decimal	NULL	NULL
-NULL	float	NULL	NULL
 NULL	int	NULL	NULL
 NULL	smallint	NULL	NULL
 NULL	time	NULL	NULL
@@ -434,7 +383,7 @@ NULL	mysql	func	ret	tinyint	NULL	NULL	NU
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
 NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp(6)
 1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
-NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	general_log	thread_id	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
@@ -481,13 +430,6 @@ NULL	mysql	help_topic	help_category_id	s
 3.0000	mysql	index_stats	index_name	varchar	64	192	utf8	utf8_bin	varchar(64)
 NULL	mysql	index_stats	prefix_arity	int	NULL	NULL	NULL	NULL	int(11) unsigned
 NULL	mysql	index_stats	avg_frequency	decimal	NULL	NULL	NULL	NULL	decimal(12,4)
-NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
-NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	mysql	plugin	name	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	mysql	plugin	dl	varchar	128	384	utf8	utf8_general_ci	varchar(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
@@ -534,50 +476,6 @@ NULL	mysql	servers	Port	int	NULL	NULL	NU
 3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
-NULL	mysql	slave_master_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_master_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int(10) unsigned
-1.0000	mysql	slave_master_info	Master_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Master_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_master_info	Host	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	User_name	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	User_password	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Port	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_master_info	Connect_retry	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_master_info	Enabled_ssl	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
-1.0000	mysql	slave_master_info	Ssl_ca	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ssl_capath	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ssl_cert	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ssl_cipher	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ssl_key	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Ssl_verify_server_cert	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
-NULL	mysql	slave_master_info	Heartbeat	float	NULL	NULL	NULL	NULL	float
-1.0000	mysql	slave_master_info	Bind	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ignored_server_ids	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Uuid	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_master_info	Retry_count	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_master_info	Ssl_crl	text	65535	65535	utf8	utf8_bin	text
-1.0000	mysql	slave_master_info	Ssl_crlpath	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_relay_log_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_relay_log_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int(10) unsigned
-1.0000	mysql	slave_relay_log_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_relay_log_info	Relay_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_relay_log_info	Master_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_relay_log_info	Master_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	slave_relay_log_info	Sql_delay	int	NULL	NULL	NULL	NULL	int(11)
-NULL	mysql	slave_relay_log_info	Number_of_workers	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_worker_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_worker_info	Worker_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-1.0000	mysql	slave_worker_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_worker_info	Relay_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_worker_info	Master_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_worker_info	Master_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_worker_info	Checkpoint_relay_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_worker_info	Checkpoint_relay_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-1.0000	mysql	slave_worker_info	Checkpoint_master_log_name	text	65535	65535	utf8	utf8_bin	text
-NULL	mysql	slave_worker_info	Checkpoint_master_log_pos	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-NULL	mysql	slave_worker_info	Checkpoint_seqno	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	slave_worker_info	Checkpoint_group_size	int	NULL	NULL	NULL	NULL	int(10) unsigned
-1.0000	mysql	slave_worker_info	Checkpoint_group_bitmap	blob	65535	65535	NULL	NULL	blob
 NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp(6)
 1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time(6)
@@ -589,6 +487,7 @@ NULL	mysql	slow_log	last_insert_id	int	N
 NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
 NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	thread_id	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
@@ -656,3 +555,4 @@ NULL	mysql	user	max_connections	int	NULL
 NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11)
 1.0000	mysql	user	plugin	char	64	64	latin1	latin1_swedish_ci	char(64)
 1.0000	mysql	user	authentication_string	text	65535	65535	utf8	utf8_bin	text
+3.0000	mysql	user	password_expired	enum	1	3	utf8	utf8_general_ci	enum('N','Y')

=== modified file 'mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result	2013-05-28 13:39:56 +0000
+++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result	2013-08-01 12:04:13 +0000
@@ -44,7 +44,6 @@ def	mysql	innodb_index_stats	0	mysql	PRI
 def	mysql	innodb_index_stats	0	mysql	PRIMARY	4	stat_name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	innodb_table_stats	0	mysql	PRIMARY	1	database_name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	innodb_table_stats	0	mysql	PRIMARY	2	table_name	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	plugin	0	mysql	PRIMARY	1	name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proc	0	mysql	PRIMARY	1	db	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proc	0	mysql	PRIMARY	2	name	A	#CARD#	NULL	NULL		BTREE		
@@ -61,10 +60,6 @@ def	mysql	proxies_priv	0	mysql	PRIMARY	2
 def	mysql	proxies_priv	0	mysql	PRIMARY	3	Proxied_host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proxies_priv	0	mysql	PRIMARY	4	Proxied_user	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_master_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_relay_log_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_worker_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_worker_info	0	mysql	PRIMARY	2	Worker_id	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	1	mysql	Grantor	1	Grantor	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE		
@@ -123,7 +118,6 @@ def	mysql	innodb_index_stats	0	mysql	PRI
 def	mysql	innodb_index_stats	0	mysql	PRIMARY	4	stat_name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	innodb_table_stats	0	mysql	PRIMARY	1	database_name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	innodb_table_stats	0	mysql	PRIMARY	2	table_name	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	plugin	0	mysql	PRIMARY	1	name	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proc	0	mysql	PRIMARY	1	db	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proc	0	mysql	PRIMARY	2	name	A	#CARD#	NULL	NULL		BTREE		
@@ -140,10 +134,6 @@ def	mysql	proxies_priv	0	mysql	PRIMARY	2
 def	mysql	proxies_priv	0	mysql	PRIMARY	3	Proxied_host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	proxies_priv	0	mysql	PRIMARY	4	Proxied_user	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_master_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_relay_log_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_worker_info	0	mysql	PRIMARY	1	Master_id	A	#CARD#	NULL	NULL		BTREE		
-def	mysql	slave_worker_info	0	mysql	PRIMARY	2	Worker_id	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	1	mysql	Grantor	1	Grantor	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE		
 def	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE		

=== modified file 'mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result	2013-05-28 13:39:56 +0000
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result	2013-08-01 12:04:13 +0000
@@ -22,18 +22,13 @@ def	mysql	name	mysql	help_topic	UNIQUE
 def	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 def	mysql	PRIMARY	mysql	host	PRIMARY KEY
 def	mysql	PRIMARY	mysql	index_stats	PRIMARY KEY
-def	mysql	innodb_index_stats_ibfk_1	mysql	innodb_index_stats	FOREIGN KEY
 def	mysql	PRIMARY	mysql	innodb_index_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	innodb_table_stats	PRIMARY KEY
-def	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
 def	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 def	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proxies_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	servers	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_master_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_relay_log_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_worker_info	PRIMARY KEY
 def	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	table_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
@@ -62,18 +57,13 @@ def	mysql	name	mysql	help_topic	UNIQUE
 def	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 def	mysql	PRIMARY	mysql	host	PRIMARY KEY
 def	mysql	PRIMARY	mysql	index_stats	PRIMARY KEY
-def	mysql	innodb_index_stats_ibfk_1	mysql	innodb_index_stats	FOREIGN KEY
 def	mysql	PRIMARY	mysql	innodb_index_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	innodb_table_stats	PRIMARY KEY
-def	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
 def	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 def	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proxies_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	servers	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_master_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_relay_log_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_worker_info	PRIMARY KEY
 def	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	table_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY

=== modified file 'mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result	2013-07-18 14:46:57 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result	2013-08-01 12:04:13 +0000
@@ -359,29 +359,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
 TABLE_NAME	plugin
 TABLE_TYPE	BASE TABLE
 ENGINE	MYISAM_OR_MARIA
@@ -497,75 +474,6 @@ user_comment	MySQL Foreign Servers table
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	mysql
-TABLE_NAME	slave_master_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Master Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
-TABLE_NAME	slave_relay_log_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Relay Log Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
-TABLE_NAME	slave_worker_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Worker Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
 TABLE_NAME	slow_log
 TABLE_TYPE	BASE TABLE
 ENGINE	CSV
@@ -1134,29 +1042,6 @@ user_comment
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	mysql
-TABLE_NAME	ndb_binlog_index
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
 TABLE_NAME	plugin
 TABLE_TYPE	BASE TABLE
 ENGINE	MYISAM_OR_MARIA
@@ -1272,75 +1157,6 @@ user_comment	MySQL Foreign Servers table
 Separator	-----------------------------------------------------
 TABLE_CATALOG	def
 TABLE_SCHEMA	mysql
-TABLE_NAME	slave_master_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Master Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
-TABLE_NAME	slave_relay_log_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Relay Log Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
-TABLE_NAME	slave_worker_info
-TABLE_TYPE	BASE TABLE
-ENGINE	MYISAM_OR_MARIA
-VERSION	10
-ROW_FORMAT	DYNAMIC_OR_PAGE
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	utf8_general_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	Worker Information
-Separator	-----------------------------------------------------
-TABLE_CATALOG	def
-TABLE_SCHEMA	mysql
 TABLE_NAME	slow_log
 TABLE_TYPE	BASE TABLE
 ENGINE	CSV



More information about the commits mailing list