~drizzle-trunk/drizzle/development

Merge from Monty's tree

added added

removed removed

4597

char buff[NAME_LEN*2+1];

4598

if (db && db[0])

4599

{

4600

strxnmov(buff,sizeof(buff)-1,db,".",table_name,NULL);

4600

/* We're in an error condition, two extra strlen's aren't going

4601

* to kill us */

4602

assert(strlen(db) <= NAME_LEN);

4603

assert(strlen(table_name) <= NAME_LEN);

4604

strcpy(buff, db);

4605

strcat(buff,".");

4606

strcat(buff, table_name);

4601

4607

table_name=buff;

4602

4608

}

4603

4609

my_error(ER_UNKNOWN_TABLE, MYF(0), table_name, session->where);