Merge bk-internal:/home/bk/mysql-5.0

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build

3 files changed, 78 insertions, 70 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fbe5a643fe7..27e70e84afe 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3641,8 +3641,16 @@ sub mysqld_arguments ($$$$) {
 
   if ( $mysql_version_id >= 50036)
   {
-    # Prevent the started mysqld to access files outside of vardir
-    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
+    # By default, prevent the started mysqld to access files outside of vardir
+    my $secure_file_dir= $opt_vardir;
+    if ( $opt_suite ne "main" )
+    {
+      # When running a suite other than default allow the mysqld
+      # access to subdirs of mysql-test/ in order to make it possible
+      # to "load data" from the suites data/ directory.
+      $secure_file_dir= $glob_mysql_test_dir;
+    }
+    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $secure_file_dir);
   }
 
   if ( $mysql_version_id >= 50000 )
diff --git a/mysql-test/r/help.result b/mysql-test/r/help.result
index 85ca832828d..de8ed249528 100644
--- a/mysql-test/r/help.result
+++ b/mysql-test/r/help.result
@@ -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);
diff --git a/mysql-test/t/help.test b/mysql-test/t/help.test
index ff431fb4ebd..de0cefab76c 100644
--- a/mysql-test/t/help.test
+++ b/mysql-test/t/help.test
@@ -13,30 +13,30 @@
 #      impossible_category_3
 #                            impossible_function_7 
 
-insert into mysql.help_category(help_category_id,name)values(1,'impossible_category_1');
-select @category1_id:= 1;
-insert into mysql.help_category(help_category_id,name)values(2,'impossible_category_2');
-select @category2_id:= 2;
-insert into mysql.help_category(help_category_id,name,parent_category_id)values(3,'impossible_category_3',@category2_id);
-select @category3_id:= 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 @topic1_id:= 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 @topic2_id:= 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 @topic3_id:= 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 @topic4_id:= 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 @topic5_id:= 5;
-
-insert into mysql.help_keyword(help_keyword_id,name)values(1,'impossible_function_1');
-select @keyword1_id:= 1;
-insert into mysql.help_keyword(help_keyword_id,name)values(2,'impossible_function_5');
-select @keyword2_id:= 2;
-insert into mysql.help_keyword(help_keyword_id,name)values(3,'impossible_function_6');
-select @keyword3_id:= 3;
+insert into mysql.help_category(help_category_id,name)values(10001,'impossible_category_1');
+select @category1_id:= 10001;
+insert into mysql.help_category(help_category_id,name)values(10002,'impossible_category_2');
+select @category2_id:= 10002;
+insert into mysql.help_category(help_category_id,name,parent_category_id)values(10003,'impossible_category_3',@category2_id);
+select @category3_id:= 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');
+select @topic1_id:= 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');
+select @topic2_id:= 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');
+select @topic3_id:= 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');
+select @topic4_id:= 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');
+select @topic5_id:= 10105;
+
+insert into mysql.help_keyword(help_keyword_id,name)values(10201,'impossible_function_1');
+select @keyword1_id:= 10201;
+insert into mysql.help_keyword(help_keyword_id,name)values(10202,'impossible_function_5');
+select @keyword2_id:= 10202;
+insert into mysql.help_keyword(help_keyword_id,name)values(10203,'impossible_function_6');
+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(@keyword2_id,@topic1_id);