Skip to content

M
mariadb
Commit 55e0ff5c authored by unknown's avatar unknown
Browse files
Options

Test "help": 

Shift the ID values up into a range where they will not collide with those
which we use for real data, when we fill the system tables.

Will be merged up to 5.0 where it is needed for 5.0.38.


mysql-test/r/help.result:
  Fix the result file according to the changed ID values in "help.test".
mysql-test/t/help.test:
  Now that (at least in 5.0) the system tables are filled with real data,
  inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
  like it should already have done in customer installations.
  
  Shift the ID values up into a high area where they will not conflict,
  also make the distinct for the different kinds of values (= unique throughout the test).
  
  No change to the logic.
parent 39333ba7
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 68 deletions
mysql-test/r/help.result
View file @ 55e0ff5c
insert into mysql.help_category(help_category_id,name)values(1,'impossible_category_1'); insert into mysql.help_category(help_category_id,name)values(10001,'impossible_category_1');
select @category1_id:= 1; select @category1_id:= 10001;
@category1_id:= 1 @category1_id:= 10001
1 10001
insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2'); insert into mysql.help_category(help_category_id,name)values(10002,'impossible_category_2');
select @category2_id:= 2; select @category2_id:= 10002;
@category2_id:= 2 @category2_id:= 10002
2 10002
insert into mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id); insert into mysql.help_category(help_category_id,name,parent_category_id)values(10003,'impossible_category_3',@category2_id);
select @category3_id:= 3; select @category3_id:= 10003;
@category3_id:= 3 @category3_id:= 10003
3 10003
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(1,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10101,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1');
select @topic1_id:= 1; select @topic1_id:= 10101;
@topic1_id:= 1 @topic1_id:= 10101
1 10101
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(2,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10102,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2');
select @topic2_id:= 2; select @topic2_id:= 10102;
@topic2_id:= 2 @topic2_id:= 10102
2 10102
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(3,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10103,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3');
select @topic3_id:= 3; select @topic3_id:= 10103;
@topic3_id:= 3 @topic3_id:= 10103
3 10103
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(4,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10104,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4');
select @topic4_id:= 4; select @topic4_id:= 10104;
@topic4_id:= 4 @topic4_id:= 10104
4 10104
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(5,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10105,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7');
select @topic5_id:= 5; select @topic5_id:= 10105;
@topic5_id:= 5 @topic5_id:= 10105
5 10105
insert into mysql.help_keyword(help_keyword_id,name)values(1,'impossible_function_1'); insert into mysql.help_keyword(help_keyword_id,name)values(10201,'impossible_function_1');
select @keyword1_id:= 1; select @keyword1_id:= 10201;
@keyword1_id:= 1 @keyword1_id:= 10201
1 10201
insert into mysql.help_keyword(help_keyword_id,name)values(2,'impossible_function_5'); insert into mysql.help_keyword(help_keyword_id,name)values(10202,'impossible_function_5');
select @keyword2_id:= 2; select @keyword2_id:= 10202;
@keyword2_id:= 2 @keyword2_id:= 10202
2 10202
insert into mysql.help_keyword(help_keyword_id,name)values(3,'impossible_function_6'); insert into mysql.help_keyword(help_keyword_id,name)values(10203,'impossible_function_6');
select @keyword3_id:= 3; select @keyword3_id:= 10203;
@keyword3_id:= 3 @keyword3_id:= 10203
3 10203
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword1_id,@topic2_id); insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword1_id,@topic2_id);
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword2_id,@topic1_id); insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword2_id,@topic1_id);
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword3_id,@topic3_id); insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword3_id,@topic3_id);
......
mysql-test/t/help.test
View file @ 55e0ff5c
...@@ -13,30 +13,30 @@ ...@@ -13,30 +13,30 @@
# impossible_category_3 # impossible_category_3
# impossible_function_7 # impossible_function_7
insert into mysql.help_category(help_category_id,name)values(1,'impossible_category_1'); insert into mysql.help_category(help_category_id,name)values(10001,'impossible_category_1');
select @category1_id:= 1; select @category1_id:= 10001;
insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2'); insert into mysql.help_category(help_category_id,name)values(10002,'impossible_category_2');
select @category2_id:= 2; select @category2_id:= 10002;
insert into mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id); insert into mysql.help_category(help_category_id,name,parent_category_id)values(10003,'impossible_category_3',@category2_id);
select @category3_id:= 3; select @category3_id:= 10003;
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(1,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10101,'impossible_function_1',@category1_id,'description of \n impossible_function1\n','example of \n impossible_function1');
select @topic1_id:= 1; select @topic1_id:= 10101;
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(2,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10102,'impossible_function_2',@category1_id,'description of \n impossible_function2\n','example of \n impossible_function2');
select @topic2_id:= 2; select @topic2_id:= 10102;
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(3,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10103,'impossible_function_3',@category2_id,'description of \n impossible_function3\n','example of \n impossible_function3');
select @topic3_id:= 3; select @topic3_id:= 10103;
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(4,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10104,'impossible_function_4',@category2_id,'description of \n impossible_function4\n','example of \n impossible_function4');
select @topic4_id:= 4; select @topic4_id:= 10104;
insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(5,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7'); insert into mysql.help_topic(help_topic_id,name,help_category_id,description,example)values(10105,'impossible_function_7',@category3_id,'description of \n impossible_function5\n','example of \n impossible_function7');
select @topic5_id:= 5; select @topic5_id:= 10105;
insert into mysql.help_keyword(help_keyword_id,name)values(1,'impossible_function_1'); insert into mysql.help_keyword(help_keyword_id,name)values(10201,'impossible_function_1');
select @keyword1_id:= 1; select @keyword1_id:= 10201;
insert into mysql.help_keyword(help_keyword_id,name)values(2,'impossible_function_5'); insert into mysql.help_keyword(help_keyword_id,name)values(10202,'impossible_function_5');
select @keyword2_id:= 2; select @keyword2_id:= 10202;
insert into mysql.help_keyword(help_keyword_id,name)values(3,'impossible_function_6'); insert into mysql.help_keyword(help_keyword_id,name)values(10203,'impossible_function_6');
select @keyword3_id:= 3; select @keyword3_id:= 10203;
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword1_id,@topic2_id); insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword1_id,@topic2_id);
insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword2_id,@topic1_id); insert into mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword2_id,@topic1_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7