merging

include/mysql_com.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key_primary.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/odbc.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/key_primary.result b/mysql-test/r/key_primary.result
index 87289f1cf54..e148548b721 100644
--- a/mysql-test/r/key_primary.result
+++ b/mysql-test/r/key_primary.result
@@ -12,9 +12,9 @@ select * from t1 where t1 like "a_\%";
 t1
 AB%
 describe select * from t1 where t1="ABC";
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	const	PRIMARY	PRIMARY	3	const	1	
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	const	PRIMARY	PRIMARY	3	const	1	
 describe select * from t1 where t1="ABCD";
-Comment
-Impossible WHERE noticed after reading const tables
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE								Impossible WHERE noticed after reading const tables
 drop table t1;