bk commit into 5.0 tree (lars:1.2416)

[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-23 14:12:22+01:00, lars@stripped +4 -0
  Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
  into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
  MERGE: 1.2392.92.2

  sql/mysqld.cc@stripped, 2007-03-23 14:12:16+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.596.1.1

  sql/sql_base.cc@stripped, 2007-03-23 14:12:17+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.370.2.1

  sql/sql_class.cc@stripped, 2007-03-23 14:12:17+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.265.1.1

  sql/sql_select.cc@stripped, 2007-03-23 14:12:17+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.498.2.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:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/MERGE/mysql-5.0-merge/RESYNC

--- 1.598/sql/mysqld.cc	2007-03-23 14:12:30 +01:00
+++ 1.599/sql/mysqld.cc	2007-03-23 14:12:30 +01:00
@@ -6126,12 +6126,12 @@ The minimum value for this variable is 4
    (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULL,
    REQUIRED_ARG, 32*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},
   {"transaction_alloc_block_size", OPT_TRANS_ALLOC_BLOCK_SIZE,
-   "Allocation block size for transactions to be stored in binary log",
+   "Allocation block size for various transaction-related structures",
    (gptr*) &global_system_variables.trans_alloc_block_size,
    (gptr*) &max_system_variables.trans_alloc_block_size, 0, GET_ULONG,
    REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0},
   {"transaction_prealloc_size", OPT_TRANS_PREALLOC_SIZE,
-   "Persistent buffer for transactions to be stored in binary log",
+   "Persistent buffer for various transaction-related structures",
    (gptr*) &global_system_variables.trans_prealloc_size,
    (gptr*) &max_system_variables.trans_prealloc_size, 0, GET_ULONG,
    REQUIRED_ARG, TRANS_ALLOC_PREALLOC_SIZE, 1024, ~0L, 0, 1024, 0},

--- 1.372/sql/sql_base.cc	2007-03-23 14:12:30 +01:00
+++ 1.373/sql/sql_base.cc	2007-03-23 14:12:30 +01:00
@@ -2950,7 +2950,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.266/sql/sql_class.cc	2007-03-23 14:12:30 +01:00
+++ 1.267/sql/sql_class.cc	2007-03-23 14:12:30 +01:00
@@ -1236,7 +1236,6 @@ bool select_export::send_data(List<Item>
   }
   row_count++;
   Item *item;
-  char *buff_ptr=buff;
   uint used_length=0,items_left=items.elements;
   List_iterator_fast<Item> li(items);
 
@@ -1336,19 +1335,18 @@ bool select_export::send_data(List<Item>
 	  goto err;
       }
     }
-    buff_ptr=buff;				// Place separators here
     if (res && (!exchange->opt_enclosed || result_type == STRING_RESULT))
     {
-      memcpy(buff_ptr,exchange->enclosed->ptr(),exchange->enclosed->length());
-      buff_ptr+=exchange->enclosed->length();
+      if (my_b_write(&cache, (byte*) exchange->enclosed->ptr(),
+                     exchange->enclosed->length()))
+        goto err;
     }
     if (--items_left)
     {
-      memcpy(buff_ptr,exchange->field_term->ptr(),field_term_length);
-      buff_ptr+=field_term_length;
+      if (my_b_write(&cache, (byte*) exchange->field_term->ptr(),
+                     field_term_length))
+        goto err;
     }
-    if (my_b_write(&cache,(byte*) buff,(uint) (buff_ptr-buff)))
-      goto err;
   }
   if (my_b_write(&cache,(byte*) exchange->line_term->ptr(),
 		 exchange->line_term->length()))

--- 1.500/sql/sql_select.cc	2007-03-23 14:12:30 +01:00
+++ 1.501/sql/sql_select.cc	2007-03-23 14:12:30 +01:00
@@ -9169,7 +9169,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();