merged

mysql-test/r/ctype_ucs.result

@@ -492,13 +492,15 @@ create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
-show binlog events from 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
-master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)
+show binlog events from 95;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	95	User var	1	135	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
+master-bin.000001	135	Query	1	218	use `test`; insert into t2 values (@v)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
 use test;
 SET TIMESTAMP=10000;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
+SET @@session.sql_mode=0;
 insert into t2 values (@v);
 drop table t2;

mysql-test/r/heap_hash.result

@@ -352,6 +352,6 @@ t3	1	a	1	a	NULL	NULL	NULL	NULL		HASH
 t3	1	a	2	b	NULL	15	NULL	NULL		HASH	
 explain select * from t1 ignore key(btree_idx), t3 where t1.name='matt' and t3.a = concat('',t1.name) and t3.b=t1.name;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t3	ref	a	a	40	const,const	6	Using where
 1	SIMPLE	t1	ref	heap_idx	heap_idx	20	const	7	Using where
-1	SIMPLE	t3	ref	a	a	40	func,const	6	Using where
 drop table t1, t2, t3;

mysql-test/r/user_var.result

@@ -173,18 +173,12 @@ SET @`a b`='hello';
 INSERT INTO t1 VALUES(@`a b`);
 set @var1= "';aaa";
 insert into t1 values (@var1);
-create table t2 (c char(30)) charset=ucs2;
-set @v=convert('abc' using ucs2);
-insert into t2 values (@v);
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	95	User var	1	136	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
 master-bin.000001	136	Query	1	222	use `test`; INSERT INTO t1 VALUES(@`a b`)
 master-bin.000001	222	User var	1	264	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
 master-bin.000001	264	Query	1	350	use `test`; insert into t1 values (@var1)
-master-bin.000001	350	Query	1	448	use `test`; create table t2 (c char(30)) charset=ucs2
-master-bin.000001	448	User var	1	488	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
-master-bin.000001	488	Query	1	571	use `test`; insert into t2 values (@v)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci;
 use test;

mysql-test/t/ctype_ucs.test

@@ -332,7 +332,7 @@ create table t2 (c char(30)) charset=ucs2;
 set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
-show binlog events from 79;
+show binlog events from 95;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).

mysql-test/t/group_min_max.test

@@ -598,8 +598,10 @@ drop table t3;
 # Bug #6142: a problem with the empty innodb table
 #
 
+--disable_warnings
 create table t1 (
   a varchar(30), b varchar(30), primary key(a), key(b)
 ) engine=innodb;
+--enable_warnings
 select distinct a from t1;
 drop table t1;

sql/ha_heap.cc

@@ -131,7 +131,7 @@ int ha_heap::write_row(byte * buf)
 int ha_heap::update_row(const byte * old_data, byte * new_data)
 {
   int res;
-  statistic_increment(ha_update_count,&LOCK_status);
+  statistic_increment(table->in_use->status_var.ha_update_count,&LOCK_status);
   if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
     table->timestamp_field->set_time();
   res= heap_update(file,old_data,new_data);