diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-05 22:34:33 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-05 22:34:33 +0300 |
| commit | b89367f2f8ad437551a449825f0e03dea553fcce (patch) | |
| tree | 12f68ee51e11c2152bfc43d6c7613a7d392f82bc /mysql-test/r/mysqlbinlog2.result | |
| parent | 67da87d82e15f2efd81be1ed11384204215c23fd (diff) | |
| download | mariadb-git-b89367f2f8ad437551a449825f0e03dea553fcce.tar.gz | |
Fixes for tests after merge from 5.0
mysql-test/r/grant.result:
Fixed a result. Editor added wrong characters.
mysql-test/r/mysqlbinlog2.result:
Fixed
mysql-test/r/sp.result:
Fixed a result, moved lines around.
mysql-test/r/sp_trans.result:
Fixed a result, moved lines around.
mysql-test/t/mysqlbinlog2.test:
Merged tests from 5.0
mysql-test/t/sp_trans.test:
Merged test from 5.0 and fixed to be compatible with 5.1
sql/sql_class.cc:
Merged from 5.0
sql/sql_error.cc:
Fixed push_warning()
Diffstat (limited to 'mysql-test/r/mysqlbinlog2.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog2.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result index 8ca18b70e69..ef6e4ee80fd 100644 --- a/mysql-test/r/mysqlbinlog2.result +++ b/mysql-test/r/mysqlbinlog2.result @@ -134,7 +134,6 @@ SET @@session.sql_mode=0/*!*/; /*!\C latin1 *//*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; insert into t1 values(null, "d")/*!*/; -SET INSERT_ID=5/*!*/; DELIMITER ; # End of log file ROLLBACK /* added by mysqlbinlog */; @@ -512,7 +511,6 @@ SET @@session.sql_mode=0/*!*/; /*!\C latin1 *//*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; insert into t1 values(null, "d")/*!*/; -SET INSERT_ID=5/*!*/; DELIMITER ; # End of log file ROLLBACK /* added by mysqlbinlog */; |