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, 2 insertions, 2 deletions

diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result
index 4eb34ebfd63..7ce0f78da76 100644
--- a/mysql-test/r/varbinary.result
+++ b/mysql-test/r/varbinary.result
@@ -12,8 +12,8 @@ create table t1 (ID int(8) unsigned zerofill not null auto_increment,UNIQ bigint
 insert into t1 set UNIQ=0x38afba1d73e6a18a;
 insert into t1 set UNIQ=123;
 explain select * from t1 where UNIQ=0x38afba1d73e6a18a;
-table	type	possible_keys	key	key_len	ref	rows	Extra
-t1	const	UNIQ	UNIQ	8	const	1	
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	const	UNIQ	UNIQ	8	const	1	
 drop table t1;
 select x'hello';
 You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'x'hello'' at line 1