bk commit into 5.0 tree (gkodinov:1.2389)

[gkodinov]

Below is the list of changes that have just been committed into a local
5.0 repository of gkodinov. When gkodinov 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-01-26 12:44:33+01:00, gkodinov@stripped +3 -0
  Merge dl145s.mysql.com:/users/gkodinov/mysql-5.0
  into  dl145s.mysql.com:/users/gkodinov/mysql-5.0-opt
  MERGE: 1.2382.2.4

  sql/item.h@stripped, 2007-01-26 12:44:27+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.215.1.1

  sql/sql_table.cc@stripped, 2007-01-26 12:44:27+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.331.1.1

  sql/sql_update.cc@stripped, 2007-01-26 12:44:27+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.205.1.3

# 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:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/users/gkodinov/mysql-5.0-opt/RESYNC

--- 1.217/sql/item.h	2007-01-12 22:43:23 +01:00
+++ 1.218/sql/item.h	2007-01-26 12:44:27 +01:00
@@ -336,23 +336,18 @@ public:
   {
     save_table_list=                  context->table_list;
     save_first_name_resolution_table= context->first_name_resolution_table;
-    save_next_name_resolution_table=  (context->first_name_resolution_table) ?
-                                      context->first_name_resolution_table->
-                                               next_name_resolution_table :
-                                      NULL;
     save_resolve_in_select_list=      context->resolve_in_select_list;
     save_next_local=                  table_list->next_local;
+    save_next_name_resolution_table=  table_list->next_name_resolution_table;
   }
 
   /* Restore a name resolution context from saved state. */
   void restore_state(Name_resolution_context *context, TABLE_LIST *table_list)
   {
     table_list->next_local=                save_next_local;
+    table_list->next_name_resolution_table= save_next_name_resolution_table;
     context->table_list=                   save_table_list;
     context->first_name_resolution_table=  save_first_name_resolution_table;
-    if (context->first_name_resolution_table)
-      context->first_name_resolution_table->
-               next_name_resolution_table= save_next_name_resolution_table;
     context->resolve_in_select_list=       save_resolve_in_select_list;
   }
 };

--- 1.332/sql/sql_table.cc	2007-01-20 12:10:17 +01:00
+++ 1.333/sql/sql_table.cc	2007-01-26 12:44:27 +01:00
@@ -3931,7 +3931,7 @@ copy_data_between_tables(TABLE *from,TAB
   Copy_field *copy,*copy_end;
   ulong found_count,delete_count;
   THD *thd= current_thd;
-  uint length;
+  uint length= 0;
   SORT_FIELD *sortorder;
   READ_RECORD info;
   TABLE_LIST   tables;

--- 1.209/sql/sql_update.cc	2007-01-03 08:52:45 +01:00
+++ 1.210/sql/sql_update.cc	2007-01-26 12:44:27 +01:00
@@ -302,7 +302,7 @@ int mysql_update(THD *thd,
 	Doing an ORDER BY;  Let filesort find and sort the rows we are going
 	to update
       */
-      uint         length;
+      uint         length= 0;
       SORT_FIELD  *sortorder;
       ha_rows examined_rows;