bk commit into 5.0 tree (lars:1.2427)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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-03-31 12:36:50+02:00, lars@stripped +3 -0
  Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
  into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
  MERGE: 1.2410.1.15

  sql/sql_base.cc@stripped, 2007-03-31 12:36:46+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.372.1.1

  sql/sql_select.cc@stripped, 2007-03-31 12:36:46+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.500.1.1

  sql/table.h@stripped, 2007-03-31 12:36:46+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.139.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:	lars
# Host:	dl145h.mysql.com
# Root:	/nfsdisk1/lars/MERGE/mysql-5.0-merge/RESYNC

--- 1.374/sql/sql_base.cc	2007-03-31 12:36:57 +02:00
+++ 1.375/sql/sql_base.cc	2007-03-31 12:36:57 +02:00
@@ -2953,7 +2953,7 @@ TABLE *open_temporary_table(THD *thd, co
   share= tmp_table->s;
   tmp_table->reginfo.lock_type=TL_WRITE;	 // Simulate locked
   share->tmp_table= (tmp_table->file->has_transactions() ? 
-                     TRANSACTIONAL_TMP_TABLE : TMP_TABLE);
+                     TRANSACTIONAL_TMP_TABLE : NON_TRANSACTIONAL_TMP_TABLE);
   share->table_cache_key= (char*) (tmp_table+1);
   share->db= share->table_cache_key;
   share->key_length= (uint) (strmov(((char*) (share->table_name=

--- 1.505/sql/sql_select.cc	2007-03-31 12:36:57 +02:00
+++ 1.506/sql/sql_select.cc	2007-03-31 12:36:57 +02:00
@@ -9173,7 +9173,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
   table->s->table_name= table->s->path= tmpname;
   table->s->db= "";
   table->s->blob_ptr_size= mi_portable_sizeof_char_ptr;
-  table->s->tmp_table= TMP_TABLE;
+  table->s->tmp_table= NON_TRANSACTIONAL_TMP_TABLE;
   table->s->db_low_byte_first=1;                // True for HEAP and MyISAM
   table->s->table_charset= param->table_charset;
   table->s->keys_for_keyread.init();

--- 1.140/sql/table.h	2007-03-31 12:36:57 +02:00
+++ 1.141/sql/table.h	2007-03-31 12:36:57 +02:00
@@ -274,6 +274,11 @@ struct st_table {
   my_bool no_cache;
   /* To signal that we should reset query_id for tables and cols */
   my_bool clear_query_id;
+  /*
+    To indicate that a non-null value of the auto_increment field
+    was provided by the user or retrieved from the current record.
+    Used only in the MODE_NO_AUTO_VALUE_ON_ZERO mode.
+  */
   my_bool auto_increment_field_not_null;
   my_bool insert_or_update;             /* Can be used by the handler */
   my_bool alias_name_used;		/* true if table_name is alias */