← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.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/sql_load.cc
280
280
 
281
281
      struct stat stat_info;
282
282
      if (stat(name,&stat_info))
 
283
      {
 
284
        my_error(ER_FILE_NOT_FOUND, MYF(0), name, errno);
283
285
        return(true);
 
286
      }
284
287
 
285
288
      // if we are not in slave thread, the file must be:
286
289
      if (!session->slave_thread &&
296
299
        is_fifo = 1;
297
300
    }
298
301
    if ((file=my_open(name,O_RDONLY,MYF(MY_WME))) < 0)
 
302
    {
 
303
      my_error(ER_CANT_OPEN_FILE, MYF(0), my_errno);
299
304
      return(true);
 
305
    }
300
306
  }
301
307
 
302
308
  COPY_INFO info;