diff options
| author | unknown <monty@mysql.com> | 2004-11-12 21:24:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-12 21:24:16 +0200 |
| commit | 83015bb6e397919dd3c970dd263c0e8826918633 (patch) | |
| tree | a243e10cedf415490ba7812f30575871555ce73d /mysql-test/r/mix_innodb_myisam_binlog.result | |
| parent | 87a37a36bc6b86f4ef1716c51cd8664828a003a0 (diff) | |
| download | mariadb-git-83015bb6e397919dd3c970dd263c0e8826918633.tar.gz | |
Portability fix for gcc 2.95.3
After merge fixes
mysql-test/r/mix_innodb_myisam_binlog.result:
After merge fixes
mysys/default.c:
After merge fixes
sql/mysql_priv.h:
Portability fix for gcc 2.95.3
sql/sql_base.cc:
Portability fix for gcc 2.95.3
Diffstat (limited to 'mysql-test/r/mix_innodb_myisam_binlog.result')
| -rw-r--r-- | mysql-test/r/mix_innodb_myisam_binlog.result | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index 9d6e9bd767a..abcb451df65 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -174,10 +174,12 @@ select a from t1 order by a; a 16 18 -master-bin.000001 79 Query 1 79 use `test`; BEGIN -master-bin.000001 119 Query 1 79 use `test`; insert into t1 values(16) -master-bin.000001 179 Query 1 79 use `test`; insert into t1 values(18) -master-bin.000001 239 Query 1 239 use `test`; COMMIT +show binlog events from 95; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 95 Query 1 # use `test`; BEGIN +master-bin.000001 157 Query 1 # use `test`; insert into t1 values(16) +master-bin.000001 239 Query 1 # use `test`; insert into t1 values(18) +master-bin.000001 321 Query 1 # use `test`; COMMIT delete from t1; delete from t2; alter table t2 type=MyISAM; |