bk commit into 5.0 tree (monty:1.2419)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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-02-21 16:45:45+02:00, monty@stripped +5 -0
  After merge fixes
  This also fixes a bug in counting number of rows that are updated when we have many simultanous queries

  extra/yassl/taocrypt/src/asn.cpp@stripped, 2007-02-21 16:45:44+02:00, monty@stripped +0 -2
    After merge fixes

  mysql-test/r/ndb_lock.result@stripped, 2007-02-21 16:45:44+02:00, monty@stripped +1 -1
    After merge fixes

  sql/item_cmpfunc.cc@stripped, 2007-02-21 16:45:44+02:00, monty@stripped +1 -1
    After merge fixes

  sql/item_subselect.cc@stripped, 2007-02-21 16:45:44+02:00, monty@stripped +4 -5
    After merge fixes

  sql/sql_insert.cc@stripped, 2007-02-21 16:45:44+02:00, monty@stripped +1 -1
    After merge fixes
    (This actually fixes a bug in old code when many connections are in use)

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0

--- 1.235/sql/item_cmpfunc.cc	2007-02-21 14:07:05 +02:00
+++ 1.236/sql/item_cmpfunc.cc	2007-02-21 16:45:44 +02:00
@@ -904,7 +904,7 @@
           */
           for (i= 0; i < ncols; i++)
           {
-            if (cache->el(i)->null_value)
+            if (cache->element_index(i)->null_value)
               item_subs->set_cond_guard_var(i, FALSE);
           }
           

--- 1.214/sql/sql_insert.cc	2007-02-21 13:05:02 +02:00
+++ 1.215/sql/sql_insert.cc	2007-02-21 16:45:44 +02:00
@@ -1193,7 +1193,7 @@
           goto err;
         }
         if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) ||
-            compare_record(table, query_id))
+            compare_record(table, thd->query_id))
         {
           info->updated++;
 

--- 1.152/sql/item_subselect.cc	2007-02-21 14:07:05 +02:00
+++ 1.153/sql/item_subselect.cc	2007-02-21 16:45:44 +02:00
@@ -1164,7 +1164,7 @@
     optimizer->keep_top_level_cache();
 
     thd->lex->current_select= current;
-    unit->uncacheable|= UNCACHEABLE_DEPENDENT;
+    master_unit->uncacheable|= UNCACHEABLE_DEPENDENT;
 
     if (!abort_on_null && left_expr->maybe_null && !pushed_cond_guards)
     {
@@ -1220,7 +1220,7 @@
                                       (char *)"<list ref>")
                             );
       Item *col_item= new Item_cond_or(item_eq, item_isnull);
-      if (!abort_on_null && left_expr->el(i)->maybe_null)
+      if (!abort_on_null && left_expr->element_index(i)->maybe_null)
       {
         if (!(col_item= new Item_func_trig_cond(col_item, get_cond_guard(i))))
           DBUG_RETURN(RES_ERROR);
@@ -1234,7 +1234,7 @@
                                                 ref_pointer_array + i,
                                                 (char *)"<no matter>",
                                                 (char *)"<list ref>"));
-      if (!abort_on_null && left_expr->el(i)->maybe_null)
+      if (!abort_on_null && left_expr->element_index(i)->maybe_null)
       {
         if (!(item_nnull_test= 
               new Item_func_trig_cond(item_nnull_test, get_cond_guard(i))))
@@ -1311,7 +1311,7 @@
           TODO: why we create the above for cases where the right part
                 cant be NULL?
         */
-        if (left_expr->el(i)->maybe_null)
+        if (left_expr->element_index(i)->maybe_null)
         {
           if (!(item= new Item_func_trig_cond(item, get_cond_guard(i))))
             DBUG_RETURN(RES_ERROR);
@@ -1762,7 +1762,6 @@
   if (!executed)
   {
     item->reset_value_registration();
-    bool have_changed_access= FALSE;
     JOIN_TAB *changed_tabs[MAX_TABLES];
     JOIN_TAB **last_changed_tab= changed_tabs;
     if (item->have_guarded_conds())

--- 1.13/mysql-test/r/ndb_lock.result	2007-01-15 11:32:36 +02:00
+++ 1.14/mysql-test/r/ndb_lock.result	2007-02-21 16:45:44 +02:00
@@ -121,7 +121,7 @@
 x	y	z
 1	one	1
 select * from t1 where x = 2 for update;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+Got one of the listed errors
 rollback;
 commit;
 begin;

--- 1.13/extra/yassl/taocrypt/src/asn.cpp	2007-02-21 14:07:05 +02:00
+++ 1.14/extra/yassl/taocrypt/src/asn.cpp	2007-02-21 16:45:44 +02:00
@@ -747,8 +747,6 @@
                 idx += length2;
             }
 
-            source_.advance(oidSz + 1);
-            word32 length2 = GetLength(source_);
             source_.advance(length2);
         }
     }