Drizzle

Merge lp:~brianaker/drizzle/fix-non-repeat-tests into lp:~drizzle-trunk/drizzle/development

  1. fix-non-repeat-tests
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: not available
Merged at revision: 2425
Proposed branch: lp:~brianaker/drizzle/fix-non-repeat-tests
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 116 lines (+26/-8)
5 files modified
tests/r/greedy_optimizer.result (+3/-0)
tests/r/variables.result (+5/-4)
tests/suite/access/r/definer_test.result (+8/-0)
tests/t/greedy_optimizer.test (+3/-0)
tests/t/variables.test (+7/-4)
To merge this branch: bzr merge lp:~brianaker/drizzle/fix-non-repeat-tests
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+76633@code.launchpad.net
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
=== modified file 'tests/r/greedy_optimizer.result'
--- tests/r/greedy_optimizer.result 2010-08-21 22:42:44 +0000
+++ tests/r/greedy_optimizer.result 2011-09-22 17:58:23 +0000
@@ -655,3 +655,6 @@
655Variable_name Value655Variable_name Value
656Last_query_cost #656Last_query_cost #
657drop table t1,t2,t3,t4,t5,t6,t7;657drop table t1,t2,t3,t4,t5,t6,t7;
658set optimizer_search_depth=default;
659set optimizer_prune_level=default;
660set optimizer_search_depth=default;
658661
=== modified file 'tests/r/variables.result'
--- tests/r/variables.result 2011-01-16 11:16:55 +0000
+++ tests/r/variables.result 2011-09-22 17:58:23 +0000
@@ -1,4 +1,5 @@
1drop table if exists t1,t2;1drop table if exists t1,t2;
2set @my_sort_buffer_size =@@global.sort_buffer_size;
2set @my_max_heap_table_size =@@global.max_heap_table_size;3set @my_max_heap_table_size =@@global.max_heap_table_size;
3set @my_max_join_size =@@global.max_join_size;4set @my_max_join_size =@@global.max_join_size;
4set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;5set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
@@ -549,7 +550,7 @@
549set GLOBAL bulk_insert_buffer_size=DEFAULT;550set GLOBAL bulk_insert_buffer_size=DEFAULT;
550set GLOBAL join_buffer_size=DEFAULT;551set GLOBAL join_buffer_size=DEFAULT;
551set GLOBAL max_allowed_packet=DEFAULT;552set GLOBAL max_allowed_packet=DEFAULT;
552set GLOBAL max_heap_table_size=DEFAULT;553set GLOBAL max_heap_table_size=@my_max_heap_table_size;
553set GLOBAL max_join_size=DEFAULT;554set GLOBAL max_join_size=DEFAULT;
554set GLOBAL max_sort_length=DEFAULT;555set GLOBAL max_sort_length=DEFAULT;
555set GLOBAL max_write_lock_count=DEFAULT;556set GLOBAL max_write_lock_count=DEFAULT;
@@ -557,8 +558,8 @@
557set GLOBAL mysql_protocol_buffer_length=DEFAULT;558set GLOBAL mysql_protocol_buffer_length=DEFAULT;
558set GLOBAL read_buffer_size=DEFAULT;559set GLOBAL read_buffer_size=DEFAULT;
559set GLOBAL read_rnd_buffer_size=DEFAULT;560set GLOBAL read_rnd_buffer_size=DEFAULT;
560set GLOBAL server_id=DEFAULT;561set global server_id=@my_server_id;
561set GLOBAL sort_buffer_size=DEFAULT;562set GLOBAL sort_buffer_size=@my_sort_buffer_size;
562set GLOBAL table_open_cache=DEFAULT;563set GLOBAL table_open_cache=DEFAULT;
563set GLOBAL storage_engine= @my_storage_engine;564set GLOBAL storage_engine= @my_storage_engine;
564set GLOBAL tmp_table_size=DEFAULT;565set GLOBAL tmp_table_size=DEFAULT;
@@ -566,7 +567,7 @@
566set SESSION bulk_insert_buffer_size=DEFAULT;567set SESSION bulk_insert_buffer_size=DEFAULT;
567set SESSION join_buffer_size=DEFAULT;568set SESSION join_buffer_size=DEFAULT;
568set SESSION max_allowed_packet=DEFAULT;569set SESSION max_allowed_packet=DEFAULT;
569set SESSION max_heap_table_size=DEFAULT;570set SESSION max_heap_table_size=@my_max_heap_table_size;
570set SESSION max_join_size=DEFAULT;571set SESSION max_join_size=DEFAULT;
571set SESSION max_sort_length=DEFAULT;572set SESSION max_sort_length=DEFAULT;
572set SESSION read_buffer_size=DEFAULT;573set SESSION read_buffer_size=DEFAULT;
573574
=== added file 'tests/suite/access/r/definer_test.result'
--- tests/suite/access/r/definer_test.result 1970-01-01 00:00:00 +0000
+++ tests/suite/access/r/definer_test.result 2011-09-22 17:58:23 +0000
@@ -0,0 +1,8 @@
1CREATE TABLE A (A SERIAL) DEFINER "mine";
2SHOW CREATE TABLE A;
3Table Create Table
4A CREATE TABLE `A` (
5 `A` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
6 UNIQUE KEY `A` (`A`) USING BTREE
7) ENGINE=InnoDB COLLATE = utf8_general_ci DEFINER 'mine'
8DROP TABLE A;
09
=== modified file 'tests/t/greedy_optimizer.test'
--- tests/t/greedy_optimizer.test 2010-08-21 22:42:44 +0000
+++ tests/t/greedy_optimizer.test 2011-09-22 17:58:23 +0000
@@ -379,3 +379,6 @@
379show status like 'Last_query_cost';379show status like 'Last_query_cost';
380380
381drop table t1,t2,t3,t4,t5,t6,t7;381drop table t1,t2,t3,t4,t5,t6,t7;
382set optimizer_search_depth=default;
383set optimizer_prune_level=default;
384set optimizer_search_depth=default;
382385
=== modified file 'tests/t/variables.test'
--- tests/t/variables.test 2011-01-16 11:16:55 +0000
+++ tests/t/variables.test 2011-09-22 17:58:23 +0000
@@ -5,6 +5,9 @@
5drop table if exists t1,t2;5drop table if exists t1,t2;
6--enable_warnings6--enable_warnings
77
8#Store original
9set @my_sort_buffer_size =@@global.sort_buffer_size;
10
8#11#
9# Bug #19263: variables.test doesn't clean up after itself (I/II -- save)12# Bug #19263: variables.test doesn't clean up after itself (I/II -- save)
10#13#
@@ -482,7 +485,7 @@
482set GLOBAL bulk_insert_buffer_size=DEFAULT;485set GLOBAL bulk_insert_buffer_size=DEFAULT;
483set GLOBAL join_buffer_size=DEFAULT;486set GLOBAL join_buffer_size=DEFAULT;
484set GLOBAL max_allowed_packet=DEFAULT;487set GLOBAL max_allowed_packet=DEFAULT;
485set GLOBAL max_heap_table_size=DEFAULT;488set GLOBAL max_heap_table_size=@my_max_heap_table_size;
486set GLOBAL max_join_size=DEFAULT;489set GLOBAL max_join_size=DEFAULT;
487set GLOBAL max_sort_length=DEFAULT;490set GLOBAL max_sort_length=DEFAULT;
488set GLOBAL max_write_lock_count=DEFAULT;491set GLOBAL max_write_lock_count=DEFAULT;
@@ -490,8 +493,8 @@
490set GLOBAL mysql_protocol_buffer_length=DEFAULT;493set GLOBAL mysql_protocol_buffer_length=DEFAULT;
491set GLOBAL read_buffer_size=DEFAULT;494set GLOBAL read_buffer_size=DEFAULT;
492set GLOBAL read_rnd_buffer_size=DEFAULT;495set GLOBAL read_rnd_buffer_size=DEFAULT;
493set GLOBAL server_id=DEFAULT;496set global server_id=@my_server_id;
494set GLOBAL sort_buffer_size=DEFAULT;497set GLOBAL sort_buffer_size=@my_sort_buffer_size;
495set GLOBAL table_open_cache=DEFAULT;498set GLOBAL table_open_cache=DEFAULT;
496set GLOBAL storage_engine= @my_storage_engine;499set GLOBAL storage_engine= @my_storage_engine;
497set GLOBAL tmp_table_size=DEFAULT;500set GLOBAL tmp_table_size=DEFAULT;
@@ -500,7 +503,7 @@
500set SESSION bulk_insert_buffer_size=DEFAULT;503set SESSION bulk_insert_buffer_size=DEFAULT;
501set SESSION join_buffer_size=DEFAULT;504set SESSION join_buffer_size=DEFAULT;
502set SESSION max_allowed_packet=DEFAULT;505set SESSION max_allowed_packet=DEFAULT;
503set SESSION max_heap_table_size=DEFAULT;506set SESSION max_heap_table_size=@my_max_heap_table_size;
504set SESSION max_join_size=DEFAULT;507set SESSION max_join_size=DEFAULT;
505set SESSION max_sort_length=DEFAULT;508set SESSION max_sort_length=DEFAULT;
506set SESSION read_buffer_size=DEFAULT;509set SESSION read_buffer_size=DEFAULT;