Drizzle

Merge lp:~stewart/drizzle/bug698315 into lp:drizzle/7.0

  1. bug698315
  2. Merge into 7.0
Proposed by Stewart Smith
Status: Merged
Approved by: Brian Aker
Approved revision: 2070
Merged at revision: 2070
Proposed branch: lp:~stewart/drizzle/bug698315
Merge into: lp:drizzle/7.0
Diff against target: 113 lines (+28/-5)
5 files modified
plugin/innobase/handler/ha_innodb.cc (+5/-5)
plugin/innobase/tests/r/innodb.result (+4/-0)
plugin/innobase/tests/r/innodb_trx.result (+4/-0)
plugin/innobase/tests/t/innodb.test (+4/-0)
plugin/innobase/tests/t/innodb_trx.test (+11/-0)
To merge this branch: bzr merge lp:~stewart/drizzle/bug698315
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+45687@code.launchpad.net

Description of the change

fixes some innobase tests for test-run.pl --repeat=2

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/702/

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/innobase/handler/ha_innodb.cc'
2--- plugin/innobase/handler/ha_innodb.cc 2011-01-09 23:00:13 +0000
3+++ plugin/innobase/handler/ha_innodb.cc 2011-01-10 13:23:42 +0000
4@@ -2008,13 +2008,13 @@
5 }
6
7 if (format_id >= 0) {
8- innobase_file_format_max=
9- trx_sys_file_format_id_to_name((uint)format_id);
10+ innobase_file_format_max.assign(
11+ trx_sys_file_format_id_to_name((uint)format_id));
12
13 /* Update the max format id in the system tablespace. */
14- char name_buff[100];
15- strcpy(name_buff, innobase_file_format_max.c_str());
16- if (trx_sys_file_format_max_set(format_id, (const char **)&name_buff))
17+ const char *name_buff;
18+
19+ if (trx_sys_file_format_max_set(format_id, &name_buff))
20 {
21 errmsg_printf(ERRMSG_LVL_WARN,
22 " [Info] InnoDB: the file format in the system "
23
24=== modified file 'plugin/innobase/tests/r/innodb.result'
25--- plugin/innobase/tests/r/innodb.result 2010-12-08 21:50:36 +0000
26+++ plugin/innobase/tests/r/innodb.result 2011-01-10 13:23:42 +0000
27@@ -1426,6 +1426,7 @@
28 Variable_name Value
29 show status like "Innodb_row_lock_time_avg";
30 Variable_name Value
31+set @my_innodb_sync_spin_loops = @@global.innodb_sync_spin_loops;
32 show variables like "innodb_sync_spin_loops";
33 Variable_name Value
34 innodb_sync_spin_loops 30
35@@ -1441,6 +1442,8 @@
36 show variables like "innodb_sync_spin_loops";
37 Variable_name Value
38 innodb_sync_spin_loops 20
39+set @@global.innodb_sync_spin_loops = @my_innodb_sync_spin_loops;
40+set @my_innodb_thread_concurrency = @@global.innodb_thread_concurrency;
41 show variables like "innodb_thread_concurrency";
42 Variable_name Value
43 innodb_thread_concurrency 0
44@@ -1458,6 +1461,7 @@
45 show variables like "innodb_thread_concurrency";
46 Variable_name Value
47 innodb_thread_concurrency 16
48+set @@global.innodb_thread_concurrency = @my_innodb_thread_concurrency;
49 show variables like "innodb_concurrency_tickets";
50 Variable_name Value
51 innodb_concurrency_tickets 500
52
53=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
54--- plugin/innobase/tests/r/innodb_trx.result 2010-12-17 14:10:13 +0000
55+++ plugin/innobase/tests/r/innodb_trx.result 2011-01-10 13:23:42 +0000
56@@ -32,3 +32,7 @@
57 select TRX_STATE,TRX_QUERY from data_dictionary.INNODB_TRX;
58 TRX_STATE TRX_QUERY
59 RUNNING NULL
60+commit;
61+commit;
62+use test;
63+drop table t1;
64
65=== modified file 'plugin/innobase/tests/t/innodb.test'
66--- plugin/innobase/tests/t/innodb.test 2010-12-07 09:12:12 +0000
67+++ plugin/innobase/tests/t/innodb.test 2011-01-10 13:23:42 +0000
68@@ -1051,6 +1051,7 @@
69 show status like "Innodb_row_lock_time_avg";
70
71 # Test for innodb_sync_spin_loops variable
72+set @my_innodb_sync_spin_loops = @@global.innodb_sync_spin_loops;
73 show variables like "innodb_sync_spin_loops";
74 set global innodb_sync_spin_loops=1000;
75 show variables like "innodb_sync_spin_loops";
76@@ -1058,8 +1059,10 @@
77 show variables like "innodb_sync_spin_loops";
78 set global innodb_sync_spin_loops=20;
79 show variables like "innodb_sync_spin_loops";
80+set @@global.innodb_sync_spin_loops = @my_innodb_sync_spin_loops;
81
82 # Test for innodb_thread_concurrency variable
83+set @my_innodb_thread_concurrency = @@global.innodb_thread_concurrency;
84 show variables like "innodb_thread_concurrency";
85 set global innodb_thread_concurrency=1001;
86 show variables like "innodb_thread_concurrency";
87@@ -1067,6 +1070,7 @@
88 show variables like "innodb_thread_concurrency";
89 set global innodb_thread_concurrency=16;
90 show variables like "innodb_thread_concurrency";
91+set @@global.innodb_thread_concurrency = @my_innodb_thread_concurrency;
92
93 # Test for innodb_concurrency_tickets variable
94 show variables like "innodb_concurrency_tickets";
95
96=== modified file 'plugin/innobase/tests/t/innodb_trx.test'
97--- plugin/innobase/tests/t/innodb_trx.test 2010-12-17 14:10:13 +0000
98+++ plugin/innobase/tests/t/innodb_trx.test 2011-01-10 13:23:42 +0000
99@@ -14,3 +14,14 @@
100 connection con2;
101 sleep 0.1;
102 select TRX_STATE,TRX_QUERY from data_dictionary.INNODB_TRX;
103+
104+connection con1;
105+commit;
106+connection con2;
107+commit;
108+sleep 0.1;
109+disconnect con1;
110+disconnect con2;
111+connection default;
112+use test;
113+drop table t1;

Subscribers

People subscribed via source and target branches