Commit 336acaf7 authored by Matthias Leich's avatar Matthias Leich
Browse files

Merge actual bugteam tree -> local tree

parents 5c58d353 3f966ec7

mysql-test/extra/binlog_tests/innodb_stat.test

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ drop table t1; 


# Test for testable InnoDB status variables. This test

# uses previous ones(pages_created, rows_deleted, ...).

-- replace_regex /51[12]/51_/

show status like "Innodb_buffer_pool_pages_total";

show status like "Innodb_page_size";

show status like "Innodb_rows_deleted";

mysql-test/r/loaddata.result

+121 −0
Original line number Diff line number Diff line
@@ -337,6 +337,126 @@ DROP VIEW v2; 
DROP VIEW v3;



# -- End of Bug#35469.

Bug#37114

SET SESSION character_set_client=latin1;

SET SESSION character_set_server=latin1;

SET SESSION character_set_connection=latin1;

SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;

test LOAD DATA INFILE

SET sql_mode = '';

SELECT '1 \\aa\n' INTO DUMPFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt';

CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;

SET sql_mode = 'NO_BACKSLASH_ESCAPES';

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' ';

SELECT * FROM t1;

id	val1

1	\aa

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114_out.txt' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1;

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114_out.txt' FIELDS               TERMINATED BY ' ' FROM t1;

INSERT INTO t1 (id, val1) VALUES (1, '\aa');

SELECT * FROM t1;

id	val1

1	\aa

1	\aa

SET sql_mode='';

INSERT INTO t1 (id, val1) VALUES (1, '\aa');

SELECT * FROM t1;

id	val1

1	\aa

1	\aa

1	aa

DROP TABLE t1;

test SELECT INTO OUTFILE

CREATE TABLE t1 (id INT PRIMARY KEY, val1 CHAR(4));

CREATE TABLE t2 LIKE t1;

SET sql_mode = '';

INSERT INTO t1 (id, val1) VALUES (5, '\ttab');

INSERT INTO t1 (id, val1) VALUES (4, '\\r');

SET sql_mode = 'NO_BACKSLASH_ESCAPES';

INSERT INTO t1 (id, val1) VALUES (3, '\tx');

1.1 NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS TERMINATED BY ' ';

SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION

SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;

t	id	val1	hex(val1)

before	3	\tx	5C7478

after	3	\tx	5C7478

before	4	\r	5C72

after	4	\r	5C72

before	5		tab	09746162

after	5		tab	09746162

TRUNCATE t2;

SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");

LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")

3 \tx

4 \r

5 	tab



1.2 NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS ESCAPED BY '\' TERMINATED BY ' ' FROM t1 ORDER BY id;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS ESCAPED BY '\' TERMINATED BY ' ';

SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION

SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;

t	id	val1	hex(val1)

before	3	\tx	5C7478

after	3	\tx	5C7478

before	4	\r	5C72

after	4	\r	5C72

before	5		tab	09746162

after	5		tab	09746162

TRUNCATE t2;

SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");

LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")

3 \\tx

4 \\r

5 	tab



SET sql_mode = '';

2.1 !NO_BACKSLASH_ESCAPES, use defaults for ESCAPED BY

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS TERMINATED BY ' ' FROM t1 ORDER BY id;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS TERMINATED BY ' ';

SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION

SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;

t	id	val1	hex(val1)

before	3	\tx	5C7478

after	3	\tx	5C7478

before	4	\r	5C72

after	4	\r	5C72

before	5		tab	09746162

after	5		tab	09746162

TRUNCATE t2;

SET sql_mode = 'NO_BACKSLASH_ESCAPES';

SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");

LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")

3 \\tx

4 \\r

5 	tab



SET sql_mode = '';

2.2 !NO_BACKSLASH_ESCAPES, override defaults for ESCAPED BY

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' FIELDS ESCAPED BY '' TERMINATED BY ' ' FROM t1 ORDER BY id;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' INTO TABLE t2 FIELDS ESCAPED BY '' TERMINATED BY ' ';

SELECT 'before' AS t, id, val1, hex(val1) FROM t1 UNION

SELECT 'after' AS t, id, val1, hex(val1) FROM t2 ORDER BY id,t DESC;

t	id	val1	hex(val1)

before	3	\tx	5C7478

after	3	\tx	5C7478

before	4	\r	5C72

after	4	\r	5C72

before	5		tab	09746162

after	5		tab	09746162

TRUNCATE t2;

SET sql_mode = 'NO_BACKSLASH_ESCAPES';

SELECT LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt");

LOAD_FILE("MYSQLTEST_VARDIR/tmp/bug37114.txt")

3 \tx

4 \r

5 	tab



set session sql_mode=@OLD_SQL_MODE;

DROP TABLE t1,t2;

End of 5.0 tests

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1);

SET NAMES latin1;
@@ -364,3 +484,4 @@ SET character_set_filesystem=default; 
select @@character_set_filesystem;

@@character_set_filesystem

binary

End of 5.1 tests

mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result

0 → 100644
+39 −0
Original line number Diff line number Diff line 
show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	0

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	0

drop table if exists t1;

create table t1 (a int) engine=innodb;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	1

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1

begin;

delete from t1;

commit;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	2

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1

drop table t1;

show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

show status like "Innodb_rows_deleted";

Variable_name	Value

Innodb_rows_deleted	2000

show status like "Innodb_rows_inserted";

Variable_name	Value

Innodb_rows_inserted	2000

show status like "Innodb_rows_updated";

Variable_name	Value

Innodb_rows_updated	0

mysql-test/suite/binlog/r/binlog_row_innodb_stat.result

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Binlog_cache_disk_use 1 
drop table t1;

show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	512

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384

mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Binlog_cache_disk_use 1 
drop table t1;

show status like "Innodb_buffer_pool_pages_total";

Variable_name	Value

Innodb_buffer_pool_pages_total	512

Innodb_buffer_pool_pages_total	51_

show status like "Innodb_page_size";

Variable_name	Value

Innodb_page_size	16384