← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Stewart Smith
  • Date: 2009-05-19 04:22:01 UTC
  • mto: (991.1.9 for-brian)
  • mto: This revision was merged to the branch mainline in revision 1033.
  • Revision ID: stewart@flamingspork.com-20090519042201-gwp8gqfknmypbhfi
Put table_name into table proto in parser, and use that when creating table proto file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1668
1668
bool mysql_create_table_no_lock(Session *session,
1669
1669
                                const char *db, const char *table_name,
1670
1670
                                HA_CREATE_INFO *create_info,
 
1671
                                drizzled::message::Table *table_proto,
1671
1672
                                Alter_info *alter_info,
1672
1673
                                bool internal_tmp_table,
1673
1674
                                uint32_t select_field_count,
1687
1688
               MYF(0));
1688
1689
    return(true);
1689
1690
  }
 
1691
  assert(strcmp(table_name,table_proto->name().c_str())==0);
1690
1692
  if (check_engine(session, table_name, create_info))
1691
1693
    return(true);
1692
1694
  db_options= create_info->table_options;
1832
1834
  create_info->table_options=db_options;
1833
1835
 
1834
1836
  if (rea_create_table(session, path, db, table_name,
 
1837
                       table_proto,
1835
1838
                       create_info, alter_info->create_list,
1836
1839
                       key_count, key_info_buffer, file, false))
1837
1840
    goto unlock_and_end;
1882
1885
 
1883
1886
bool mysql_create_table(Session *session, const char *db, const char *table_name,
1884
1887
                        HA_CREATE_INFO *create_info,
 
1888
                        drizzled::message::Table *table_proto,
1885
1889
                        Alter_info *alter_info,
1886
1890
                        bool internal_tmp_table,
1887
1891
                        uint32_t select_field_count)
1933
1937
  }
1934
1938
 
1935
1939
  result= mysql_create_table_no_lock(session, db, table_name, create_info,
 
1940
                                     table_proto,
1936
1941
                                     alter_info,
1937
1942
                                     internal_tmp_table,
1938
1943
                                     select_field_count, true);
2821
2826
    return true;
2822
2827
 
2823
2828
  local_create_info.max_rows= 0;
 
2829
  drizzled::message::Table table_proto;
 
2830
  table_proto.set_name("system_stupid_i_s_fix_nonsense");
 
2831
 
2824
2832
  if (rea_create_table(session, dst_path, "system_tmp", "system_stupid_i_s_fix_nonsense",
 
2833
                       &table_proto,
2825
2834
                       &local_create_info, alter_info.create_list,
2826
2835
                       keys, schema_table->table->s->key_info,
2827
2836
                       schema_table->table->file, true))
3265
3274
    Create a table with a temporary name.
3266
3275
    We don't log the statement, it will be logged later.
3267
3276
  */
 
3277
  drizzled::message::Table table_proto;
 
3278
  table_proto.set_name(tmp_name);
3268
3279
  error= mysql_create_table(session, new_db, tmp_name,
3269
 
                            create_info, alter_info, 1, 0);
 
3280
                            create_info, &table_proto, alter_info, 1, 0);
3270
3281
 
3271
3282
  return(error);
3272
3283
}