bk commit into 5.0 tree (tsmith:1.2513)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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-06-04 17:44:09+02:00, tsmith@stripped +7 -0
  Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
  into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
  MERGE: 1.2493.2.20

  mysql-test/mysql-test-run.pl@stripped, 2007-06-04 17:44:01+02:00, tsmith@stripped
+0 -0
    Auto merged
    MERGE: 1.221.1.1

  mysql-test/t/mysqltest.test@stripped, 2007-06-04 17:44:01+02:00, tsmith@stripped
+0 -0
    Auto merged
    MERGE: 1.56.2.2

  sql/mysql_priv.h@stripped, 2007-06-04 17:44:01+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.452.1.1

  sql/mysqld.cc@stripped, 2007-06-04 17:44:01+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.609.2.1

  sql/sql_parse.cc@stripped, 2007-06-04 17:44:02+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.621.1.1

  sql/sql_table.cc@stripped, 2007-06-04 17:44:02+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.343.1.1

  sql/sql_yacc.yy@stripped, 2007-06-04 17:44:02+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.519.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:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50/RESYNC

--- 1.455/sql/mysql_priv.h	2007-05-28 12:34:30 +02:00
+++ 1.456/sql/mysql_priv.h	2007-06-04 17:44:01 +02:00
@@ -813,9 +813,8 @@ bool mysql_alter_table(THD *thd, char *n
                        Alter_info *alter_info,
                        uint order_num, ORDER *order, bool ignore);
 bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list);
-bool mysql_create_like_table(THD *thd, TABLE_LIST *table,
-                             HA_CREATE_INFO *create_info,
-                             Table_ident *src_table);
+bool mysql_create_like_table(THD *thd, TABLE_LIST *table, TABLE_LIST *src_table,
+                             HA_CREATE_INFO *create_info);
 bool mysql_rename_table(enum db_type base,
 			const char *old_db,
 			const char * old_name,

--- 1.611/sql/mysqld.cc	2007-05-29 15:16:18 +02:00
+++ 1.612/sql/mysqld.cc	2007-06-04 17:44:01 +02:00
@@ -346,7 +346,15 @@ bool opt_endinfo, using_udf_functions;
 my_bool locked_in_memory;
 bool opt_using_transactions, using_update_log;
 bool volatile abort_loop;
-bool volatile shutdown_in_progress, grant_option;
+bool volatile shutdown_in_progress;
+/**
+   @brief 'grant_option' is used to indicate if privileges needs
+   to be checked, in which case the lock, LOCK_grant, is used
+   to protect access to the grant table.
+   @note This flag is dropped in 5.1 
+   @see grant_init()
+ */
+bool volatile grant_option;
 
 my_bool opt_skip_slave_start = 0; // If set, slave is not autostarted
 my_bool opt_reckless_slave = 0;

--- 1.622/sql/sql_parse.cc	2007-05-23 13:22:09 +02:00
+++ 1.623/sql/sql_parse.cc	2007-06-04 17:44:02 +02:00
@@ -1140,8 +1140,8 @@ pthread_handler_t handle_one_connection(
     net->no_send_error= 0;
 
     /* Use "connect_timeout" value during connection phase */
-    net_set_read_timeout(net, connect_timeout);
-    net_set_write_timeout(net, connect_timeout);
+    my_net_set_read_timeout(net, connect_timeout);
+    my_net_set_write_timeout(net, connect_timeout);
 
     if ((error=check_connection(thd)))
     {						// Wrong permissions
@@ -1184,8 +1184,8 @@ pthread_handler_t handle_one_connection(
     }
 
     /* Connect completed, set read/write timeouts back to tdefault */
-    net_set_read_timeout(net, thd->variables.net_read_timeout);
-    net_set_write_timeout(net, thd->variables.net_write_timeout);
+    my_net_set_read_timeout(net, thd->variables.net_read_timeout);
+    my_net_set_write_timeout(net, thd->variables.net_write_timeout);
 
     while (!net->error && net->vio != 0 &&
            !(thd->killed == THD::KILL_CONNECTION))
@@ -1537,7 +1537,7 @@ bool do_command(THD *thd)
     the client, the connection is closed or "net_wait_timeout"
     number of seconds has passed
   */
-  net_set_read_timeout(net, thd->variables.net_wait_timeout);
+  my_net_set_read_timeout(net, thd->variables.net_wait_timeout);
 
   thd->clear_error();				// Clear error message
 
@@ -1569,7 +1569,7 @@ bool do_command(THD *thd)
   }
 
   /* Restore read timeout value */
-  net_set_read_timeout(net, thd->variables.net_read_timeout);
+  my_net_set_read_timeout(net, thd->variables.net_read_timeout);
 
   /*
     packet_length contains length of data, as it was stored in packet

--- 1.344/sql/sql_table.cc	2007-05-23 13:22:09 +02:00
+++ 1.345/sql/sql_table.cc	2007-06-04 17:44:02 +02:00
@@ -3769,6 +3769,9 @@ view_err:
                             alter_info->keys_onoff);
     table->file->external_lock(thd, F_UNLCK);
     VOID(pthread_mutex_unlock(&LOCK_open));
+    error= ha_commit_stmt(thd);
+    if (ha_commit(thd))
+      error= 1;
   }
 
   thd->last_insert_id=next_insert_id;		// Needed for correct log
@@ -3939,16 +3942,6 @@ view_err:
       goto err;
     }
   }
-  /* The ALTER TABLE is always in its own transaction */
-  error = ha_commit_stmt(thd);
-  if (ha_commit(thd))
-    error=1;
-  if (error)
-  {
-    VOID(pthread_mutex_unlock(&LOCK_open));
-    broadcast_refresh();
-    goto err;
-  }
   thd->proc_info="end";
   if (mysql_bin_log.is_open())
   {
@@ -4158,8 +4151,12 @@ copy_data_between_tables(TABLE *from,TAB
   }
   to->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
 
-  ha_enable_transaction(thd,TRUE);
-
+  if (ha_enable_transaction(thd, TRUE))
+  {
+    error= 1;
+    goto err;
+  }
+  
   /*
     Ensure that the new table is saved properly to disk so that we
     can do a rename

--- 1.520/sql/sql_yacc.yy	2007-05-23 13:22:09 +02:00
+++ 1.521/sql/sql_yacc.yy	2007-06-04 17:44:02 +02:00
@@ -6201,6 +6201,9 @@ limit_options:
 	;
 limit_option:
         param_marker
+        {
+          ((Item_param *) $1)->set_strict_type(INT_RESULT);
+        }
         | ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); }
         | LONG_NUM     { $$= new Item_uint($1.str, $1.length); }
         | NUM           { $$= new Item_uint($1.str, $1.length); }

--- 1.223/mysql-test/mysql-test-run.pl	2007-05-29 13:01:20 +02:00
+++ 1.224/mysql-test/mysql-test-run.pl	2007-06-04 17:44:01 +02:00
@@ -1792,6 +1792,18 @@ sub environment_setup () {
   $ENV{'CHARSETSDIR'}=              $path_charsetsdir;
   $ENV{'UMASK'}=              "0660"; # The octal *string*
   $ENV{'UMASK_DIR'}=          "0770"; # The octal *string*
+  
+  #
+  # MySQL tests can produce output in various character sets
+  # (especially, ctype_xxx.test). To avoid confusing Perl
+  # with output which is incompatible with the current locale
+  # settings, we reset the current values of LC_ALL and LC_CTYPE to "C".
+  # For details, please see
+  # Bug#27636 tests fails if LC_* variables set to *_*.UTF-8
+  #
+  $ENV{'LC_ALL'}=             "C";
+  $ENV{'LC_CTYPE'}=           "C";
+  
   $ENV{'LC_COLLATE'}=         "C";
   $ENV{'USE_RUNNING_SERVER'}= $opt_extern;
   $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;

--- 1.58/mysql-test/t/mysqltest.test	2007-06-01 15:43:01 +02:00
+++ 1.59/mysql-test/t/mysqltest.test	2007-06-04 17:44:01 +02:00
@@ -46,11 +46,6 @@ select otto from (select 1 as otto) as t
 --error 0
 select otto from (select 1 as otto) as t1;
 
-# expectation <> response
--- // --error 1054
--- // select otto from (select 1 as otto) as t1;
-
-
 # ----------------------------------------------------------------------------
 # Negative case(statement):
 # The derived table t1 does not contain a column named 'friedrich' . 
@@ -331,9 +326,9 @@ select 3 from t1 ;
 # This is a comment
 # This is a ;  comment
 # This is a -- comment
--- This is also a comment
--- # This is also a comment
--- This is also a ; comment
+# -- This is also a comment
+# -- # This is also a comment
+# -- This is also a ; comment
 
 # ----------------------------------------------------------------------------
 # Test comments with embedded command
@@ -1869,7 +1864,7 @@ DROP TABLE t1;
 --disable_query_log
 --exec $MYSQL_TEST --help 2>&1 > /dev/null
 --exec $MYSQL_TEST --version 2>&1 > /dev/null
---enable_quary_log
+--enable_query_log
 --disable_abort_on_error
 --error 1
 --exec $MYSQL_TEST a b c 2>&1 > /dev/null