bk commit into 5.0 tree (joerg:1.2486)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-20 19:52:40+01:00, joerg@trift2. +2 -0
  Merge trift2.:/MySQL/M41/test-help-4.1
  into  trift2.:/MySQL/M50/test-help-5.0
  MERGE: 1.1616.2985.1

  mysql-test/r/help.result@stripped, 2007-03-20 19:52:37+01:00, joerg@trift2. +16 -0
    Manual merge:
    5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.
    MERGE: 1.4.1.1

  mysql-test/t/help.test@stripped, 2007-03-20 19:37:21+01:00, joerg@trift2. +0 -22
    Auto merged
    MERGE: 1.6.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/test-help-5.0/RESYNC

--- 1.5/mysql-test/r/help.result	2005-01-14 20:29:50 +01:00
+++ 1.6/mysql-test/r/help.result	2007-03-20 19:52:37 +01:00
@@ -1,63 +1,63 @@
-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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @category1_id:= 1;
-@category1_id:= 1
-1
-insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2');
+select @category1_id:= 10001;
+@category1_id:= 10001
+10001
+insert into
mysql.help_category(help_category_id,name)values(10002,'impossible_category_2');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @category2_id:= 2;
-@category2_id:= 2
-2
-insert into
mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id);
+select @category2_id:= 10002;
+@category2_id:= 10002
+10002
+insert into
mysql.help_category(help_category_id,name,parent_category_id)values(10003,'impossible_category_3',@category2_id);
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @category3_id:= 3;
-@category3_id:= 3
-3
-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');
+select @category3_id:= 10003;
+@category3_id:= 10003
+10003
+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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @topic1_id:= 1;
-@topic1_id:= 1
-1
-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');
+select @topic1_id:= 10101;
+@topic1_id:= 10101
+10101
+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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @topic2_id:= 2;
-@topic2_id:= 2
-2
-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');
+select @topic2_id:= 10102;
+@topic2_id:= 10102
+10102
+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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @topic3_id:= 3;
-@topic3_id:= 3
-3
-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');
+select @topic3_id:= 10103;
+@topic3_id:= 10103
+10103
+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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @topic4_id:= 4;
-@topic4_id:= 4
-4
-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');
+select @topic4_id:= 10104;
+@topic4_id:= 10104
+10104
+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');
 Warnings:
 Warning	1364	Field 'url' doesn't have a default value
-select @topic5_id:= 5;
-@topic5_id:= 5
-5
-insert into mysql.help_keyword(help_keyword_id,name)values(1,'impossible_function_1');
-select @keyword1_id:= 1;
-@keyword1_id:= 1
-1
-insert into mysql.help_keyword(help_keyword_id,name)values(2,'impossible_function_5');
-select @keyword2_id:= 2;
-@keyword2_id:= 2
-2
-insert into mysql.help_keyword(help_keyword_id,name)values(3,'impossible_function_6');
-select @keyword3_id:= 3;
-@keyword3_id:= 3
-3
+select @topic5_id:= 10105;
+@topic5_id:= 10105
+10105
+insert into
mysql.help_keyword(help_keyword_id,name)values(10201,'impossible_function_1');
+select @keyword1_id:= 10201;
+@keyword1_id:= 10201
+10201
+insert into
mysql.help_keyword(help_keyword_id,name)values(10202,'impossible_function_5');
+select @keyword2_id:= 10202;
+@keyword2_id:= 10202
+10202
+insert into
mysql.help_keyword(help_keyword_id,name)values(10203,'impossible_function_6');
+select @keyword3_id:= 10203;
+@keyword3_id:= 10203
+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(@keyword2_id,@topic1_id);
 insert into
mysql.help_relation(help_keyword_id,help_topic_id)values(@keyword3_id,@topic3_id);