bzr commit into mysql-6.1-fk branch (kostja:2692) WL#148

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.1-fk-stage/

 2692 Konstantin Osipov	2008-12-10
      WL#148 Foreign keys, Milestone 8, Part 1. Misc. review cleanups.
modified:
  sql/fk.cc

=== modified file 'sql/fk.cc'
--- a/sql/fk.cc	2008-12-09 22:01:03 +0000
+++ b/sql/fk.cc	2008-12-10 01:04:39 +0000
@@ -519,12 +519,12 @@ bool Foreign_key_child_rcontext::prepare
           cascading actions we will have to replace open_and_lock_tables()
           below with something more sophisticated.
   */
-  bzero(&parent_table_list, sizeof(TABLE_LIST));
-  parent_table_list.db= fk_share->parent_table_db.str;
-  parent_table_list.db_length= fk_share->parent_table_db.length;
-  parent_table_list.table_name= parent_table_list.alias=
-    fk_share->parent_table_name.str;
-  parent_table_list.table_name_length= fk_share->parent_table_name.length;
+  parent_table_list.init_one_table(fk_share->parent_table_db.str,
+                                   fk_share->parent_table_db.length,
+                                   fk_share->parent_table_name.str,
+                                   fk_share->parent_table_name.length,
+                                   fk_share->parent_table_name.str,
+                                   TL_READ);
 
   lex->reset_n_backup_query_tables_list(&query_tables_list_backup);
   lex->add_to_query_tables(&parent_table_list);
@@ -571,7 +571,7 @@ bool Foreign_key_child_rcontext::prepare
   /* Fill list of Fields which correspond to FK columns in child table. */
   List_iterator<Field> child_col_it(fk_share->column_list);
   Field *child_col;
-  while((child_col= child_col_it++))
+  while ((child_col= child_col_it++))
   {
     if (child_columns.push_back(child_table->field[child_col->field_index],
                                 thd->mem_root))