← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

A number of fixes (including long directory names again).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
2286
2286
  {
2287
2287
    int protoerr= EEXIST;
2288
2288
 
2289
 
    /*
2290
 
     * If an engine was not specified and we are reading from an I_S table, then we need to toss an
2291
 
     * error. This should go away soon.
2292
 
     * @todo make this go away!
2293
 
     */
2294
 
    if (! is_engine_set)
2295
 
    {
2296
 
      string tab_name(src_path);
2297
 
      string i_s_prefix("./information_schema/");
2298
 
      if (tab_name.compare(0, i_s_prefix.length(), i_s_prefix) == 0)
2299
 
      {
2300
 
        pthread_mutex_unlock(&LOCK_open);
2301
 
        my_error(ER_ILLEGAL_HA_CREATE_OPTION,
2302
 
                 MYF(0),
2303
 
                 "INFORMATION_ENGINE",
2304
 
                 "TEMPORARY");
2305
 
        goto err;
2306
 
      }
2307
 
    }
2308
 
 
2309
2289
    protoerr= plugin::StorageEngine::getTableDefinition(*session,
2310
2290
                                                        src_path,
2311
2291
                                                        db,