← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mysql-5.5/utopic-security

« back to all changes in this revision

Viewing changes to mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:25:54 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418182554-pflh0bjoc611yqxw
Tags: 5.5.31-0ubuntu0.13.04.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
698
698
master-bin.000001       #       Intvar  #       #       INSERT_ID=10
699
699
master-bin.000001       #       Begin_load_query        #       #       ;file_id=#;block_len=#
700
700
master-bin.000001       #       Intvar  #       #       INSERT_ID=10
701
 
master-bin.000001       #       Execute_load_query      #       #       use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`= @b + bug27417(2) ;file_id=#
 
701
master-bin.000001       #       Execute_load_query      #       #       use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @`b`) SET `b`= @b + bug27417(2) ;file_id=#
702
702
master-bin.000001       #       Query   #       #       ROLLBACK
703
703
/* the output must denote there is the query */;
704
704
drop trigger trg_del_t2;
950
950
master-bin.000001       #       Begin_load_query        #       #       ;file_id=#;block_len=#
951
951
master-bin.000001       #       Intvar  #       #       INSERT_ID=10
952
952
master-bin.000001       #       User var        #       #       @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
953
 
master-bin.000001       #       Execute_load_query      #       #       use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`= @b + bug27417(2) ;file_id=#
 
953
master-bin.000001       #       Execute_load_query      #       #       use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @`b`) SET `b`= @b + bug27417(2) ;file_id=#
954
954
master-bin.000001       #       Query   #       #       ROLLBACK
955
955
drop trigger trg_del_t2;
956
956
drop table t1,t2,t3,t4,t5;