← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

Committer: Brian Aker
Date: 2008-12-18 21:36:23 UTC
mfrom: (685.4.10 enable-tests)
Revision ID: brian@tangent.org-20081218213623-nsgvfbcax1z6epx4

Merge from Jay

files added:
tests/std_data/bug308457.txt

tests/std_data/null_test.txt

files renamed:
tests/suite/broken/r/metadata.result => tests/r/metadata.result

tests/suite/broken/r/mix2_myisam.result => tests/r/mix2_myisam.result

tests/suite/broken/r/multi_update.result => tests/r/multi_update.result

tests/suite/broken/r/null.result => tests/r/null.result

tests/suite/broken/t/metadata.test => tests/t/metadata.test

tests/suite/broken/t/mix2_myisam.test => tests/t/mix2_myisam.test

tests/suite/broken/t/multi_update.test => tests/t/multi_update.test

tests/suite/broken/t/null.test => tests/t/null.test

files modified:
drizzled/error.cc

drizzled/sql_insert.cc

drizzled/sql_load.cc

drizzled/sql_update.cc

tests/include/mix2.inc

tests/include/varchar.inc

Show diffs side-by-side

added added

removed removed

drizzled/error.cc

197

197

/* ER_NO_SUCH_INDEX 42S12 S1009 */

198

198

N_("Table '%-.192s' has no index like the one used in CREATE INDEX; recreate the table"),

199

199

/* ER_WRONG_FIELD_TERMINATORS 42000 S1009 */

200

N_("Field separator argument is not what is expected; check the manual"),

200

N_("Field separator argument '%-.32s' with length '%d' is not what is expected; check the manual"),

201

201

/* ER_BLOBS_AND_NO_TERMINATED 42000 S1009 */

202

202

N_("You can't use fixed rowlength with BLOBs; please use 'fields terminated by'"),

203

203

/* ER_TEXTFILE_NOT_READABLE */

Older »