bzr push into mysql-trunk branch (Georgi.Kodinov:3913 to 3914) WL#2392

[Georgi Kodinov]

 3914 Georgi Kodinov	2012-05-28
      WL#2392: addendum #1 : 
      - added the new column definition to is_columns_mysql_embedded

    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
 3913 magnus.blaudd@stripped	2012-05-28 [merge]
      Merge

    modified:
      sql/opt_explain_traditional.cc
=== 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	2012-03-06 14:29:42 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2012-05-28 14:35:06 +0000
@@ -270,6 +270,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) unsigned				
 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		YES	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	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')				
@@ -646,3 +647,4 @@ NULL	mysql	user	max_connections	int	NULL
 NULL	mysql	user	max_user_connections	int	NULL	NULL	NULL	NULL	int(11) unsigned
 3.0000	mysql	user	plugin	char	64	192	utf8	utf8_bin	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')

No bundle (reason: useless for push emails).