Merge lp:~percona-dev/percona-patches/5.0.77-mysql-test into lp:~percona-dev/percona-patches/5.0.77

Proposed by Aleksandr Kuzminsky
Status: Merged
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-patches/5.0.77-mysql-test
Merge into: lp:~percona-dev/percona-patches/5.0.77
Diff against target: None lines
To merge this branch: bzr merge lp:~percona-dev/percona-patches/5.0.77-mysql-test
Reviewer Review Type Date Requested Status
Yasufumi Kinoshita (community) Approve
Review via email: mp+6343@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Aleksandr Kuzminsky (akuzminsky) wrote :

mysql-test ported on 5.0.77

Revision history for this message
Yasufumi Kinoshita (yasufumi-kinoshita) wrote :

Though, I think the variables-big should be changed as the newest XtraDB's.
The fix is only succeed for single execution.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'mysql-test.patch'
2--- mysql-test.patch 1970-01-01 00:00:00 +0000
3+++ mysql-test.patch 2009-05-07 19:42:39 +0000
4@@ -0,0 +1,112 @@
5+--- a/mysql-test/r/information_schema.result 2009-05-07 19:31:26.000000000 +0000
6++++ b/mysql-test/r/information_schema.result 2009-05-07 19:32:59.000000000 +0000
7+@@ -60,6 +60,7 @@
8+ USER_STATISTICS
9+ VIEWS
10+ INNODB_IO_PATTERN
11++INNODB_RSEG
12+ columns_priv
13+ db
14+ func
15+@@ -743,7 +744,7 @@
16+ CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
17+ CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
18+ count(*)
19+-109
20++110
21+ drop view a2, a1;
22+ drop table t_crashme;
23+ select table_schema,table_name, column_name from
24+@@ -819,7 +820,7 @@
25+ flush privileges;
26+ SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
27+ table_schema count(*)
28+-information_schema 24
29++information_schema 25
30+ mysql 17
31+ create table t1 (i int, j int);
32+ create trigger trg1 before insert on t1 for each row
33+@@ -1228,6 +1229,7 @@
34+ USER_STATISTICS USER
35+ VIEWS TABLE_SCHEMA
36+ INNODB_IO_PATTERN SPACE
37++INNODB_RSEG RSEG_ID
38+ SELECT t.table_name, c1.column_name
39+ FROM information_schema.tables t
40+ INNER JOIN
41+@@ -1267,6 +1269,7 @@
42+ USER_STATISTICS USER
43+ VIEWS TABLE_SCHEMA
44+ INNODB_IO_PATTERN SPACE
45++INNODB_RSEG RSEG_ID
46+ SELECT MAX(table_name) FROM information_schema.tables;
47+ MAX(table_name)
48+ VIEWS
49+@@ -1342,6 +1345,7 @@
50+ INDEX_STATISTICS information_schema.INDEX_STATISTICS 1
51+ INNODB_BUFFER_POOL_CONTENT information_schema.INNODB_BUFFER_POOL_CONTENT 1
52+ INNODB_IO_PATTERN information_schema.INNODB_IO_PATTERN 1
53++INNODB_RSEG information_schema.INNODB_RSEG 1
54+ KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
55+ PROCESSLIST information_schema.PROCESSLIST 1
56+ PROFILING information_schema.PROFILING 1
57+--- a/mysql-test/r/information_schema_db.result 2009-05-07 19:31:27.000000000 +0000
58++++ b/mysql-test/r/information_schema_db.result 2009-05-07 19:35:01.000000000 +0000
59+@@ -29,6 +29,7 @@
60+ USER_STATISTICS
61+ VIEWS
62+ INNODB_IO_PATTERN
63++INNODB_RSEG
64+ show tables from INFORMATION_SCHEMA like 'T%';
65+ Tables_in_information_schema (T%)
66+ TABLES
67+--- a/mysql-test/r/mysqlshow.result 2009-05-07 19:31:26.000000000 +0000
68++++ b/mysql-test/r/mysqlshow.result 2009-05-07 19:36:32.000000000 +0000
69+@@ -103,6 +103,7 @@
70+ | USER_STATISTICS |
71+ | VIEWS |
72+ | INNODB_IO_PATTERN |
73++| INNODB_RSEG |
74+ +---------------------------------------+
75+ Database: INFORMATION_SCHEMA
76+ +---------------------------------------+
77+@@ -132,6 +133,7 @@
78+ | USER_STATISTICS |
79+ | VIEWS |
80+ | INNODB_IO_PATTERN |
81++| INNODB_RSEG |
82+ +---------------------------------------+
83+ Wildcard: inf_rmation_schema
84+ +--------------------+
85+--- a/mysql-test/r/variables-big.result 2009-05-07 19:31:27.000000000 +0000
86++++ b/mysql-test/r/variables-big.result 2009-05-07 19:38:40.000000000 +0000
87+@@ -1,24 +1,20 @@
88+ set session transaction_prealloc_size=1024*1024*1024*1;
89+ show processlist;
90+ Id User Host db Command Time State Info
91+-6 root localhost test Query 0 NULL show processlist
92++1 root localhost test Query 0 NULL show processlist
93+ set session transaction_prealloc_size=1024*1024*1024*2;
94+ show processlist;
95+ Id User Host db Command Time State Info
96+-6 root localhost test Query 1 NULL show processlist
97++1 root localhost test Query 0 NULL show processlist
98+ set session transaction_prealloc_size=1024*1024*1024*3;
99+ show processlist;
100+ Id User Host db Command Time State Info
101+-6 root localhost test Query 0 NULL show processlist
102++1 root localhost test Query 0 NULL show processlist
103+ set session transaction_prealloc_size=1024*1024*1024*4;
104+-Warnings:
105+-Warning 1292 Truncated incorrect transaction_prealloc_size value: '4294967296'
106+ show processlist;
107+ Id User Host db Command Time State Info
108+-6 root localhost test Query 0 NULL show processlist
109++1 root localhost test Query 0 NULL show processlist
110+ set session transaction_prealloc_size=1024*1024*1024*5;
111+-Warnings:
112+-Warning 1292 Truncated incorrect transaction_prealloc_size value: '5368709120'
113+ show processlist;
114+ Id User Host db Command Time State Info
115+-6 root localhost test Query 0 NULL show processlist
116++1 root localhost test Query 0 NULL show processlist
117
118=== modified file 'series'
119--- series 2009-05-06 09:53:18 +0000
120+++ series 2009-05-07 19:42:39 +0000
121@@ -16,3 +16,4 @@
122 innodb_thread_concurrency_timer_based.patch
123 split_buf_pool_mutex_fixed_optimistic_safe.patch
124 innodb_rw_lock.patch
125+mysql-test.patch

Subscribers

People subscribed via source and target branches