~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

Committer: Brian Aker
Date: 2011-02-04 08:47:29 UTC
mto: (2143.1.1 drizzle-build) (2147.4.1 timestamp)
mto: This revision was merged to the branch mainline in revision 2144.
Revision ID: brian@tangent.org-20110204084729-safp4cz9iv4vekrz

Merge in error message fix for just one type of error for unknown table.

Show diffs side-by-side

added added

removed removed

drizzled/table/instance/base.cc

1546

1547

if (table and table->IsInitialized())

1548

{

1549

int foo;

1550

if ((foo= parse_table_proto(session, *table)))

1549

if (parse_table_proto(session, *table))

1551

1550

{

1552

1551

local_error= ER_CORRUPT_TABLE_DEFINITION_UNKNOWN;

1553

1552

my_error(ER_CORRUPT_TABLE_DEFINITION_UNKNOWN, identifier);

1823

1822

case 1:

1824

1823

if (db_errno == ENOENT)

1825

1824

{

1826

my_error(ER_NO_SUCH_TABLE, MYF(0), db.str, table_name.str);

1825

identifier::Table identifier(db.str, table_name.str);

1826

my_error(ER_TABLE_UNKNOWN, identifier);

1827

}

1828

else

1829

{

Older »