bk commit into 5.1 tree (dlenev:1.2187)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev 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.2187 06/02/27 20:11:54 dlenev@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/dlenev/src/mysql-5.1-merges2

  sql/sql_base.cc
    1.309 06/02/27 20:11:46 dlenev@stripped +0 -0
    Auto merged

# 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:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.1-merges2/RESYNC

--- 1.308/sql/sql_base.cc	2006-02-27 19:23:15 +03:00
+++ 1.309/sql/sql_base.cc	2006-02-27 20:11:46 +03:00
@@ -4430,7 +4430,6 @@
 {
   Field_iterator_table_ref it_1, it_2;
   Natural_join_column *nj_col_1, *nj_col_2;
-  const char *field_name_1;
   Query_arena *arena, backup;
   bool add_columns= TRUE;
   bool result= TRUE;
@@ -4463,6 +4462,7 @@
   {
     bool is_created_1;
     bool found= FALSE;
+    const char *field_name_1;
     if (!(nj_col_1= it_1.get_or_create_column_ref(&is_created_1)))
       goto err;
     field_name_1= nj_col_1->name();
@@ -4663,7 +4663,6 @@
 {
   Field_iterator_table_ref it_1, it_2;
   Natural_join_column *nj_col_1, *nj_col_2;
-  bool is_created;
   Query_arena *arena, backup;
   bool result= TRUE;
   List<Natural_join_column> *non_join_columns;