~stewart/drizzle/skeleton-embedded-innodb-engine

« back to all changes in this revision

Viewing changes to drizzled/db.cc

Committer: Stewart Smith
Date: 2010-03-23 05:34:36 UTC
mfrom: (1283.2.94 staging)
Revision ID: stewart@flamingspork.com-20100323053436-gw19us4h0xvlqmjc

merge trunk

files added:
drizzled/optimizer/cost_vector.h

files removed:
drizzled/cost_vect.h

files renamed:
plugin/memcached_functions/tests/t/memc.test => plugin/memcached_functions/tests/t/memc.disabled

plugin/memcached_stats/tests/t/describe.test => plugin/memcached_stats/tests/t/describe.disabled

plugin/memcached_stats/tests/t/query.test => plugin/memcached_stats/tests/t/query.disabled

files modified:
drizzled/cursor.cc

drizzled/cursor.h

drizzled/db.cc

drizzled/include.am

drizzled/optimizer/range.cc

drizzled/optimizer/table_read_plan.h

drizzled/plugin/storage_engine.cc

drizzled/plugin/storage_engine.h

drizzled/session.cc

drizzled/session.h

drizzled/sql_base.cc

drizzled/sql_insert.cc

drizzled/sql_table.cc

drizzled/sql_yacc.yy

drizzled/statement/alter_table.cc

drizzled/statement/create_table.h

drizzled/table.cc

drizzled/table.h

drizzled/table_proto.h

drizzled/table_proto_write.cc

drizzled/table_share.cc

drizzled/table_share.h

plugin/memcached_stats/analysis_table.cc

plugin/memcached_stats/memcached_stats.cc

plugin/memcached_stats/stats_table.cc

Show diffs side-by-side

added added

removed removed

drizzled/db.cc

348

349

for (table= tables; table; table= table->next_local)

350

{

351

TableIdentifier identifier(table->db, table->table_name);

351

352

TableShare *share;

352

353

table->db_type= NULL;

353

if ((share= TableShare::getShare(table->db, table->table_name)))

354

if ((share= TableShare::getShare(identifier)))

355

{

354

356

table->db_type= share->db_type();

357

}

355

358

}

356

359

357

360

if (lock_table_names_exclusively(session, tables))

Older »