From: konstantin
Date: December 7 2005 3:30pm
Subject: bk commit into 5.0 tree (konstantin:1.1988)
List-Archive: http://lists.mysql.com/commits/15
Message-Id: <20051207153006.C90CC6CDB@dragonfly.local>

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.1988 05/12/07 18:29:48 konstantin@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/sql_parse.cc
    1.527 05/12/07 18:29:32 konstantin@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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root/RESYNC

--- 1.526/sql/sql_parse.cc	2005-12-07 17:02:39 +03:00
+++ 1.527/sql/sql_parse.cc	2005-12-07 18:29:32 +03:00
@@ -2617,7 +2617,7 @@
       goto error; /* purecov: inspected */
     thd->enable_slow_log= opt_log_slow_admin_statements;
     res = mysql_backup_table(thd, first_table);
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }
@@ -2630,7 +2630,7 @@
       goto error; /* purecov: inspected */
     thd->enable_slow_log= opt_log_slow_admin_statements;
     res = mysql_restore_table(thd, first_table);
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }
@@ -3134,7 +3134,7 @@
         mysql_bin_log.write(&qinfo);
       }
     }
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }
@@ -3146,7 +3146,7 @@
       goto error; /* purecov: inspected */
     thd->enable_slow_log= opt_log_slow_admin_statements;
     res = mysql_check_table(thd, first_table, &lex->check_opt);
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }
@@ -3168,7 +3168,7 @@
         mysql_bin_log.write(&qinfo);
       }
     }
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }
@@ -3193,7 +3193,7 @@
         mysql_bin_log.write(&qinfo);
       }
     }
-    (TABLE_LIST*) select_lex->table_list.first=first_table;
+    select_lex->table_list.first= (byte*) first_table;
     lex->query_tables=all_tables;
     break;
   }