diff options
author | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
commit | 934f5cc4662ded62609ce64be15c54d327cc554e (patch) | |
tree | 39c72cd72a11f307f9898185deca1854ccf90c57 /mysql-test/r/insert.result | |
parent | 3c9b877b19bd4eaa4734ea5d699add9ca70a4e53 (diff) | |
download | mariadb-git-934f5cc4662ded62609ce64be15c54d327cc554e.tar.gz |
Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
Diffstat (limited to 'mysql-test/r/insert.result')
-rw-r--r-- | mysql-test/r/insert.result | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 2ffa9d88618..dedde4cc408 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -46,8 +46,17 @@ insert into t1 values ('skr',NULL),('skr',NULL),('test',NULL); select * from t1; sid id skr 1 -skr 2 +skr 1 +test 1 +insert into t1 values ('rts',NULL),('rts',NULL),('test',NULL); +select * from t1; +sid id +rts 1 +rts 2 +skr 1 +skr 1 test 1 +test 2 drop table t1; drop database if exists foo; create database foo; |