diff -Naurb mysql-5.0.77_original/mysql-test/r/rpl_user_variables.result mysql-5.0.77_patched/mysql-test/r/rpl_user_variables.result --- mysql-5.0.77_original/mysql-test/r/rpl_user_variables.result 2009-01-30 09:38:23.000000000 +1100 +++ mysql-5.0.77_patched/mysql-test/r/rpl_user_variables.result 2010-03-11 18:36:04.000000000 +1100 @@ -79,32 +79,32 @@ show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 # Query 1 # use `test`; create table t1(n char(30)) -slave-bin.000001 # User var 2 # @`i1`=12345678901234 -slave-bin.000001 # User var 2 # @`i2`=-12345678901234 -slave-bin.000001 # User var 2 # @`i3`=0 -slave-bin.000001 # User var 2 # @`i4`=-1 +slave-bin.000001 # User var 1 # @`i1`=12345678901234 +slave-bin.000001 # User var 1 # @`i2`=-12345678901234 +slave-bin.000001 # User var 1 # @`i3`=0 +slave-bin.000001 # User var 1 # @`i4`=-1 slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4) -slave-bin.000001 # User var 2 # @`r1`=12.5 -slave-bin.000001 # User var 2 # @`r2`=-12.5 +slave-bin.000001 # User var 1 # @`r1`=12.5 +slave-bin.000001 # User var 1 # @`r2`=-12.5 slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@r1), (@r2) -slave-bin.000001 # User var 2 # @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci -slave-bin.000001 # User var 2 # @`s2`=_latin1 "" COLLATE latin1_swedish_ci -slave-bin.000001 # User var 2 # @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci -slave-bin.000001 # User var 2 # @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci -slave-bin.000001 # User var 2 # @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`s2`=_latin1 "" COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5) -slave-bin.000001 # User var 2 # @`n1`=NULL +slave-bin.000001 # User var 1 # @`n1`=NULL slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@n1) -slave-bin.000001 # User var 2 # @`n2`=NULL +slave-bin.000001 # User var 1 # @`n2`=NULL slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@n2) slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1) -slave-bin.000001 # User var 2 # @`a`=2 +slave-bin.000001 # User var 1 # @`a`=2 slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a+(@b:=@a+1)) -slave-bin.000001 # User var 2 # @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci +slave-bin.000001 # User var 1 # @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci slave-bin.000001 # Query 1 # use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2')) -slave-bin.000001 # User var 2 # @`a`=5 +slave-bin.000001 # User var 1 # @`a`=5 slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a),(@a) -slave-bin.000001 # User var 2 # @`a`=NULL +slave-bin.000001 # User var 1 # @`a`=NULL slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a),(@a),(@a*5) insert into t1 select * FROM (select @var1 union select @var2) AS t2; drop table t1; @@ -268,7 +268,7 @@ show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 98 Query 1 184 use `test`; create table t1 (a int) -slave-bin.000001 184 User var 2 226 @`a`=98 +slave-bin.000001 184 User var 1 226 @`a`=98 slave-bin.000001 226 Query 1 320 use `test`; insert into t1 values (@a),(98) slave-bin.000001 320 Query 1 409 use `test`; insert into t1 values (99) slave-bin.000001 409 Query 1 507 use `test`; insert into t1 select 100 limit 100 diff -Naurb mysql-5.0.77_original/sql/log_event.h mysql-5.0.77_patched/sql/log_event.h --- mysql-5.0.77_original/sql/log_event.h 2009-01-30 08:45:28.000000000 +1100 +++ mysql-5.0.77_patched/sql/log_event.h 2010-03-11 16:18:18.000000000 +1100 @@ -1281,7 +1281,7 @@ User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg, char *val_arg, ulong val_len_arg, Item_result type_arg, uint charset_number_arg) - :Log_event(), name(name_arg), name_len(name_len_arg), val(val_arg), + :Log_event(thd_arg,0,0), name(name_arg), name_len(name_len_arg), val(val_arg), val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg) { is_null= !val; } void pack_info(Protocol* protocol);