bk commit into 5.1 tree (msvensson:1.2390)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-11-27 10:39:40+01:00, msvensson@neptunus.(none) +4 -0
  Merge bk-internal:/home/bk/mysql-5.1-new-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2386.1.9

  mysql-test/mysql-test-run.pl@stripped, 2006-11-27 10:39:29+01:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.237.1.1

  sql-common/my_time.c@stripped, 2006-11-27 10:39:30+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.26.1.3

  sql/item_timefunc.cc@stripped, 2006-11-27 10:39:30+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.141.1.4

  sql/sql_parse.cc@stripped, 2006-11-27 10:39:30+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.592.1.6

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.596/sql/sql_parse.cc	2006-11-27 10:39:58 +01:00
+++ 1.597/sql/sql_parse.cc	2006-11-27 10:39:58 +01:00
@@ -2580,10 +2580,11 @@ mysql_execute_command(THD *thd)
     if (opt_readonly &&
 	!(thd->security_ctx->master_access & SUPER_ACL) &&
 	(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) &&
-	!((lex->sql_command == SQLCOM_CREATE_TABLE) &&
-	  (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) &&
-	((lex->sql_command != SQLCOM_UPDATE_MULTI) &&
-	 some_non_temp_table_to_be_updated(thd, all_tables)))
+        !((lex->sql_command == SQLCOM_CREATE_TABLE) &&
+          (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) &&
+        !((lex->sql_command == SQLCOM_DROP_TABLE) && lex->drop_temporary)
&&
+        ((lex->sql_command != SQLCOM_UPDATE_MULTI) &&
+          some_non_temp_table_to_be_updated(thd, all_tables)))
     {
       my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
       DBUG_RETURN(-1);

--- 1.239/mysql-test/mysql-test-run.pl	2006-11-27 10:39:58 +01:00
+++ 1.240/mysql-test/mysql-test-run.pl	2006-11-27 10:39:58 +01:00
@@ -1630,9 +1630,17 @@ sub environment_setup () {
   # impossible to add correct supressions, that means if "/usr/lib/debug"
   # is available, it should be added to
   # LD_LIBRARY_PATH
+  #
+  # But pthread is broken in libc6-dbg on Debian <= 3.1 (see Debian
+  # bug 399035, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399035),
+  # so don't change LD_LIBRARY_PATH on that platform.
   # --------------------------------------------------------------------------
   my $debug_libraries_path= "/usr/lib/debug";
-  if (  $opt_valgrind and -d $debug_libraries_path )
+  my $deb_version;
+  if (  $opt_valgrind and -d $debug_libraries_path and
+        (! -e '/etc/debian_version' or
+         ($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or
+         $deb_version > 3.1 ) )
   {
     push(@ld_library_paths, $debug_libraries_path);
   }