~drizzle-trunk/drizzle/development

Fix for Bug#308457. Gave UTF8 enclosure and escape character on LOAD DATA INFILE and changed the error message to be more descriptive

added added

removed removed

134

bool transactional_table;

135

Session::killed_state killed_status= Session::NOT_KILLED;

136

137

if (escaped->length() > 1 || enclosed->length() > 1)

137

/* Escape and enclosed character may be a utf8 4-byte character */

138

if (escaped->length() > 4 || enclosed->length() > 4)

138

139

{

139

my_message(ER_WRONG_FIELD_TERMINATORS,ER(ER_WRONG_FIELD_TERMINATORS),

140

MYF(0));

140

my_error(ER_WRONG_FIELD_TERMINATORS,MYF(0),enclosed->c_ptr(), enclosed->length());

141

return(true);

142

}

143

if (open_and_lock_tables(session, table_list))