summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/binlog.result97
-rw-r--r--mysql-test/r/mysqltest.result2
-rw-r--r--mysql-test/r/ssl-big.result3
3 files changed, 4 insertions, 98 deletions
diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result
index aa5c6e88d65..0a199c87545 100644
--- a/mysql-test/r/binlog.result
+++ b/mysql-test/r/binlog.result
@@ -153,105 +153,8 @@ master-bin.000001 353 Query 1 441 use `test`; insert into t1 values (2)
master-bin.000001 441 Query 1 529 use `test`; insert into t1 values (3)
master-bin.000001 529 Xid 1 556 COMMIT /* XID */
master-bin.000001 556 Query 1 632 use `test`; drop table t1
-set autocommit= 1;
-reset master;
-create table t1(n int) engine=innodb;
-insert into t1 values (1);
-insert into t1 values (2);
-insert into t1 values (3);
-commit;
-drop table t1;
-show binlog events from 0;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4
-master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=innodb
-master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (1)
-master-bin.000001 285 Xid 1 312 COMMIT /* XID */
-master-bin.000001 312 Query 1 400 use `test`; insert into t1 values (2)
-master-bin.000001 400 Xid 1 427 COMMIT /* XID */
-master-bin.000001 427 Query 1 515 use `test`; insert into t1 values (3)
-master-bin.000001 515 Xid 1 542 COMMIT /* XID */
-master-bin.000001 542 Query 1 618 use `test`; drop table t1
-reset master;
-create table t1(n int) engine=myisam;
-begin;
-insert into t1 values (4);
-insert into t1 values (5);
-insert into t1 values (6);
-commit;
-drop table t1;
-show binlog events from 0;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4
-master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=myisam
-master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (4)
-master-bin.000001 285 Query 1 373 use `test`; insert into t1 values (5)
-master-bin.000001 373 Query 1 461 use `test`; insert into t1 values (6)
-master-bin.000001 461 Query 1 537 use `test`; drop table t1
-set autocommit= 1;
-reset master;
-create table t1(n int) engine=innodb;
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 197
-insert into t1 values (1);
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 312
-insert into t1 values (2);
-insert into t1 values (3);
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 542
-commit;
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 542
-drop table t1;
-show binlog events from 0;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4
-master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=innodb
-master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (1)
-master-bin.000001 285 Xid 1 312 COMMIT /* XID */
-master-bin.000001 312 Query 1 400 use `test`; insert into t1 values (2)
-master-bin.000001 400 Xid 1 427 COMMIT /* XID */
-master-bin.000001 427 Query 1 515 use `test`; insert into t1 values (3)
-master-bin.000001 515 Xid 1 542 COMMIT /* XID */
-master-bin.000001 542 Query 1 618 use `test`; drop table t1
-set autocommit= 0;
-reset master;
-create table t1(n int) engine=myisam;
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 197
-insert into t1 values (4);
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 285
-insert into t1 values (5);
-insert into t1 values (6);
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 461
-commit;
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 461
-drop table t1;
-show binlog events from 0;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4
-master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=myisam
-master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (4)
-master-bin.000001 285 Query 1 373 use `test`; insert into t1 values (5)
-master-bin.000001 373 Query 1 461 use `test`; insert into t1 values (6)
-master-bin.000001 461 Query 1 537 use `test`; drop table t1
-set session autocommit = @ac;
set @bcs = @@binlog_cache_size;
-set @ac = @@autocommit;
set global binlog_cache_size=4096;
-set autocommit= 0;
reset master;
create table t1 (a int) engine=innodb;
show binlog events from 0;
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 8cf5f99dca3..55f78d22272 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -420,7 +420,7 @@ mysqltest: At line 1: query 'connect con2,localhost,root,,illegal_db' failed: 1
mysqltest: At line 1: Illegal argument for port: 'illegal_port'
mysqltest: At line 1: Illegal option to connect: SMTP
OK
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted, you can have max 128 connections
+mysqltest: The test didn't produce any output
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
diff --git a/mysql-test/r/ssl-big.result b/mysql-test/r/ssl-big.result
new file mode 100644
index 00000000000..39c4f34e46c
--- /dev/null
+++ b/mysql-test/r/ssl-big.result
@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS t1, t2;
+create table t1 (a int);
+drop table t1;
View Lorry Controller Status