Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

mysql-test/lib/mtr_cases.pl

@@ -593,6 +593,10 @@ sub mtr_options_from_test_file($$) {
 
   while ( my $line= <$F> )
   {
+
+    # Skip line if it start's with #
+    next if ( $line =~ /^#/ );
+
     # Match this line against tag in "tags" array
     foreach my $tag (@tags)
     {

sql/mysqld.cc

@@ -6629,6 +6629,7 @@ SHOW_VAR status_vars[]= {
   {"Com_create_function",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CREATE_FUNCTION]), SHOW_LONG_STATUS},
   {"Com_create_index",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CREATE_INDEX]), SHOW_LONG_STATUS},
   {"Com_create_table",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CREATE_TABLE]), SHOW_LONG_STATUS},
+  {"Com_create_user",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CREATE_USER]), SHOW_LONG_STATUS},
   {"Com_dealloc_sql",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_DEALLOCATE_PREPARE]), SHOW_LONG_STATUS},
   {"Com_delete",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_DELETE]), SHOW_LONG_STATUS},
   {"Com_delete_multi",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_DELETE_MULTI]), SHOW_LONG_STATUS},

support-files/mysql.server.sh

@@ -82,7 +82,7 @@ datadir_set=
 #
 lsb_functions="/lib/lsb/init-functions"
 if test -f $lsb_functions ; then
-  source $lsb_functions
+  . $lsb_functions
 else
   log_success_msg()
   {