← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Stewart Smith
  • Date: 2008-12-16 06:44:47 UTC
  • mto: This revision was merged to the branch mainline in revision 695.
  • Revision ID: stewart@flamingspork.com-20081216064447-gteyeklawmtzew6p
fix outfile_loaddata test for drizzle.

on ambiguous SELECT INTO OUTFILE, error out and don't just warn. It's an *error* if you can't load the resulting file!

Also had to file https://bugs.launchpad.net/mysql-server/+bug/308457 which means we have to disable a test

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1535
1535
  if ((uint) strlen(exchange->file_name) + NAME_LEN >= FN_REFLEN)
1536
1536
    strncpy(path,exchange->file_name,FN_REFLEN-1);
1537
1537
 
1538
 
  if ((file= create_file(session, path, exchange, &cache)) < 0)
1539
 
    return 1;
1540
1538
  /* Check if there is any blobs in data */
1541
1539
  {
1542
1540
    List_iterator_fast<Item> li(list);
1578
1576
      (exchange->opt_enclosed && non_string_results &&
1579
1577
       field_term_length && strchr(NUMERIC_CHARS, field_term_char)))
1580
1578
  {
1581
 
    push_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1582
 
                 ER_AMBIGUOUS_FIELD_TERM, ER(ER_AMBIGUOUS_FIELD_TERM));
1583
 
    is_ambiguous_field_term= true;
 
1579
    my_error(ER_AMBIGUOUS_FIELD_TERM, MYF(0));
 
1580
    return 1;
1584
1581
  }
1585
 
  else
1586
 
    is_ambiguous_field_term= false;
 
1582
 
 
1583
  if ((file= create_file(session, path, exchange, &cache)) < 0)
 
1584
    return 1;
1587
1585
 
1588
1586
  return 0;
1589
1587
}