Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam (cbd31fd1) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/innodb.result

+0 −19

Original line number	Diff line number	Diff line
		@@ -3263,22 +3263,3 @@ AUTO_INCREMENT
		200
		DROP TABLE t2;
		DROP TABLE t1;
		CREATE TABLE t1 (c1 int default NULL,
		c2 int default NULL
		) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		TRUNCATE TABLE t1;
		affected rows: 0
		INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
		affected rows: 5
		info: Records: 5 Duplicates: 0 Warnings: 0
		TRUNCATE TABLE t1;
		affected rows: 0
		DROP TABLE t1;
		Variable_name Value
		Handler_update 0
		Variable_name Value
		Handler_delete 0
		Variable_name Value
		Handler_update 1
		Variable_name Value
		Handler_delete 1

+3 −2

Original line number	Diff line number	Diff line
		@@ -162,7 +162,8 @@ Variable_name Value
		Com_show_status 8
		rnd_diff tmp_table_diff
		20 8
		show global status like 'Com%function%';
		flush status;
		show status like 'Com%function%';
		Variable_name Value
		Com_alter_function 0
		Com_create_function 0
		@@ -176,7 +177,7 @@ set ret = x * 10;
		return ret;
		end //
		drop function f1;
		show global status like 'Com%function%';
		show status like 'Com%function%';
		Variable_name Value
		Com_alter_function 0
		Com_create_function 1