bk commit into 5.0 tree (acurtis:1.1890)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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
  1.1890 05/04/09 00:36:08 acurtis@stripped +2 -0
  Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
  into xiphis.org:/var/db/bk/work-acurtis/bug6776.2

  sql/sql_udf.cc
    1.45 05/04/09 00:36:04 acurtis@stripped +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.305 05/04/09 00:35:03 acurtis@stripped +0 -0
    auto-union

# 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:	acurtis
# Host:	xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.2

--- 1.44/sql/sql_udf.cc	2005-04-06 13:15:40 +01:00
+++ 1.45/sql/sql_udf.cc	2005-04-09 00:36:04 +01:00
@@ -525,8 +525,11 @@
   tables.table_name= tables.alias= (char*) "func";
   if (!(table = open_ltable(thd,&tables,TL_WRITE)))
     goto err;
-  if (!table->file->index_read_idx(table->record[0],0,(byte*) udf_name->str,
-				   (uint) udf_name->length,
+  table->field[0]->store(udf_name->str, udf_name->length, system_charset_info);
+  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  if (!table->file->index_read_idx(table->record[0], 0,
+				   (byte*) table->field[0]->ptr,
+				   table->key_info[0].key_length,
 				   HA_READ_KEY_EXACT))
   {
     int error;

--- 1.304/BitKeeper/etc/logging_ok	2005-04-06 19:28:55 +01:00
+++ 1.305/BitKeeper/etc/logging_ok	2005-04-09 00:35:03 +01:00
@@ -9,6 +9,7 @@
 WAX@stripped
 acurtis@stripped
 acurtis@stripped
+acurtis@stripped
 administrador@stripped
 ahlentz@stripped
 akishkin@stripped