Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

client/mysqltest.c

@@ -278,7 +278,7 @@ enum enum_commands {
   Q_IF,
   Q_DISABLE_PARSING, Q_ENABLE_PARSING,
   Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
-  Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT,
+  Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP,
   Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
 
   Q_UNKNOWN,			       /* Unknown command.   */
@@ -360,6 +360,7 @@ const char *command_names[]=
   "die",
   /* Don't execute any more commands, compare result */
   "exit",
+  "skip",
   "chmod",
   "append_file",
   "cat_file",
@@ -815,27 +816,65 @@ void free_used_memory()
 }
 
 
+static void cleanup_and_exit(int exit_code)
+{
+  free_used_memory();
+  my_end(MY_CHECK_ERROR);
+
+  if (!silent)
+  {
+    switch (exit_code)
+    {
+    case 1:
+      printf("not ok\n");
+      break;
+    case 0:
+      printf("ok\n");
+      break;
+    case 62:
+      printf("skipped\n");
+    break;
+    default:
+      printf("unknown exit code: %d\n", exit_code);
+      DBUG_ASSERT(0);
+    }
+  }
+
+  exit(exit_code);
+}
+
 void die(const char *fmt, ...)
 {
+  static int dying= 0;
   va_list args;
   DBUG_ENTER("die");
   DBUG_PRINT("enter", ("start_lineno: %d", start_lineno));
 
+  /*
+    Protect against dying twice
+    first time 'die' is called, try to write log files
+    second time, just exit
+  */
+  if (dying)
+    cleanup_and_exit(1);
+
   /* Print the error message */
-  va_start(args, fmt);
-  if (fmt)
-  {
   fprintf(stderr, "mysqltest: ");
   if (cur_file && cur_file != file_stack)
     fprintf(stderr, "In included file \"%s\": ",
             cur_file->file_name);
   if (start_lineno > 0)
     fprintf(stderr, "At line %u: ", start_lineno);
+  if (fmt)
+  {
+    va_start(args, fmt);
     vfprintf(stderr, fmt, args);
+    va_end(args);
+  }
+  else
+    fprintf(stderr, "unknown error");
   fprintf(stderr, "\n");
   fflush(stderr);
-  }
-  va_end(args);
 
   /* Dump the result that has been accumulated so far to .log file */
   if (result_file_name && ds_res.length)
@@ -845,14 +884,7 @@ void die(const char *fmt, ...)
   if (result_file_name && ds_warning_messages.length)
     dump_warning_messages();
 
-  /* Clean up and exit */
-  free_used_memory();
-  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
-
-  if (!silent)
-    printf("not ok\n");
-
-  exit(1);
+  cleanup_and_exit(1);
 }
 
 
@@ -885,14 +917,7 @@ void abort_not_supported_test(const char *fmt, ...)
   }
   va_end(args);
 
-  /* Clean up and exit */
-  free_used_memory();
-  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
-
-  if (!silent)
-    printf("skipped\n");
-
-  exit(62);
+  cleanup_and_exit(62);
 }
 
 
@@ -1352,6 +1377,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
   MYSQL_RES *res;
   MYSQL_ROW row;
   MYSQL* mysql = &cur_con->mysql;
+  DYNAMIC_STRING ds_query;
   DBUG_ENTER("var_query_set");
   LINT_INIT(res);
 
@@ -1361,13 +1387,17 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
     die("Syntax error in query, missing '`'");
   ++query;
 
-  if (mysql_real_query(mysql, query, (int)(end - query)) ||
+  /* Eval the query, thus replacing all environment variables */
+  init_dynamic_string(&ds_query, 0, (end - query) + 32, 256);
+  do_eval(&ds_query, query, end, FALSE);
+
+  if (mysql_real_query(mysql, ds_query.str, ds_query.length) ||
       !(res = mysql_store_result(mysql)))
   {
-    *end = 0;
-    die("Error running query '%s': %d %s", query,
+    die("Error running query '%s': %d %s", ds_query.str,
 	mysql_errno(mysql), mysql_error(mysql));
   }
+  dynstr_free(&ds_query);
 
   if ((row = mysql_fetch_row(res)) && row[0])
   {
@@ -6287,6 +6317,9 @@ int main(int argc, char **argv)
         /* Stop processing any more commands */
         abort_flag= 1;
         break;
+      case Q_SKIP:
+        abort_not_supported_test("%s", command->first_argument);
+        break;
 
       case Q_RESULT:
         die("result, deprecated command");
@@ -6398,14 +6431,9 @@ int main(int argc, char **argv)
     dump_warning_messages();
 
   timer_output();
-  free_used_memory();
-  my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
-
   /* Yes, if we got this far the test has suceeded! Sakila smiles */
-  if (!silent)
-    printf("ok\n");
-  exit(0);
-  return 0;				/* Keep compiler happy */
+  cleanup_and_exit(0);
+  return 0; /* Keep compiler happy too */
 }
 
 

mysql-test/lib/mtr_report.pl

@@ -296,6 +296,18 @@ sub mtr_report_stats ($) {
           }
         }
       }
+
+      if ( $::opt_check_testcases )
+      {
+        # Look for warnings produced by mysqltest in testname.warnings
+        foreach my $test_warning_file
+	  ( glob("$::glob_mysql_test_dir/r/*.warnings") )
+        {
+          $found_problems= 1;
+	  print WARN "Check myqltest warnings in $test_warning_file\n";
+        }
+      }
+
       if ( $found_problems )
       {
 	mtr_warning("Got errors/warnings while running tests, please examine",

mysql-test/mysql-test-run.pl

@@ -725,8 +725,6 @@ sub command_line_setup () {
   {
     $mysqld_variables{'port'}= 3306;
     $mysqld_variables{'master-port'}= 3306;
-    $opt_skip_ndbcluster= 1;
-    $opt_skip_im= 1;
   }
 
   if ( $opt_comment )
@@ -1073,7 +1071,7 @@ sub command_line_setup () {
   # On some operating systems, there is a limit to the length of a
   # UNIX domain socket's path far below PATH_MAX, so try to avoid long
   # socket path names.
-  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) > 80 );
+  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 80 );
 
   $master->[0]=
   {
@@ -1236,6 +1234,7 @@ sub command_line_setup () {
   {
     # Turn off features not supported when running with extern server
     $opt_skip_rpl= 1;
+    $opt_skip_ndbcluster= 1;
 
     # Setup master->[0] with the settings for the extern server
     $master->[0]->{'path_sock'}=  $opt_socket ? $opt_socket : "/tmp/mysql.sock";
@@ -2031,10 +2030,7 @@ sub environment_setup () {
     $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
 
   }
-  if (!$opt_extern)
-  {
   $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}=  $file_mysql_fix_privilege_tables;
-  }
 
   # ----------------------------------------------------
   # Setup env so childs can execute my_print_defaults

mysql-test/r/mysqltest.result

@@ -277,6 +277,9 @@ let $A = changed value of A;
 # Content of $B is: initial value of B
 let $B = changed value of B;
 # Content of $A is: changed value of A
+var2: content of variable 1
+var3: content of variable 1 content of variable 1
+length of var3 is longer than 0
 mysqltest: At line 1: Missing required argument 'filename' to command 'source'
 mysqltest: At line 1: Could not open file ./non_existingFile
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep

mysql-test/t/fix_priv_tables.test

 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
+# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set
+# to the location of mysql_fix_privilege_tables.sql
+if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)
+{
+  skip Test need MYSQL_FIX_PRIVILEGE_TABLES;
+}
+
 #
 # This is the test for mysql_fix_privilege_tables
 # It checks that a system tables from mysql 4.1.23

mysql-test/t/mysqltest.test

@@ -718,6 +718,21 @@ let $A = changed value of A;
 let $B = changed value of B;
 --echo # Content of \$A is: $A
 
+# ----------------------------------------------------------------------------
+# Test let from query with $variable
+# let $<var_name>=`<query with $variable>`;
+# ----------------------------------------------------------------------------
+
+let $var1=content of variable 1;
+let $var2= `select "$var1"`;
+let $var3= `select concat("$var1", " ", "$var2")`;
+echo var2: $var2;
+echo var3: $var3;
+if (`select length("$var3") > 0`)
+{
+  echo length of var3 is longer than 0;
+}
+
 # ----------------------------------------------------------------------------
 # Test to assign let from query
 # let $<var_name>=`<query>`;

mysql-test/t/system_mysql_db_fix30020.test

 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
-# Windows doesn't support execution of shell scripts (to fix!!)
---source include/not_windows.inc
-
+# Don't run this test if $MYSQL_FIX_SYSTEM_TABLES isn't set
+# to the location of mysql_fix_privilege_tables.sql
+if (`SELECT LENGTH("$MYSQL_FIX_SYSTEM_TABLES") <= 0`)
+{
+  skip Test need MYSQL_FIX_SYSTEM_TABLES;
+}
 # check that CSV engine was compiled in, as the test relies on the presence
 # of the log tables (which are CSV-based)
 --source include/have_csv.inc

mysql-test/t/system_mysql_db_fix40123.test

 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
+# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set
+# to the location of mysql_fix_privilege_tables.sql
+if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)
+{
+  skip Test need MYSQL_FIX_PRIVILEGE_TABLES;
+}
+
 #
 # This is the test for mysql_fix_privilege_tables
 # It checks that a system tables from mysql 4.1.23

sql/Makefile.am

@@ -21,8 +21,7 @@ MYSQLBASEdir=		$(prefix)
 MYSQLLIBdir=            $(pkglibdir)
 INCLUDES =		@ZLIB_INCLUDES@ \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(top_srcdir)/regex -I$(srcdir) \
-                        $(openssl_includes)
+			-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld