← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2008-08-01 22:38:22 UTC
  • Revision ID: brian@tangent.org-20080801223822-0hh22boeev5xa8p5
Removed ALTER TABLE UPGRADE.

We have nothing to upgrade from :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
2337
2337
    res= mysql_rm_db(thd, lex->name.str, lex->drop_if_exists, 0);
2338
2338
    break;
2339
2339
  }
2340
 
  case SQLCOM_ALTER_DB_UPGRADE:
2341
 
  {
2342
 
    LEX_STRING *db= & lex->name;
2343
 
    if (end_active_trans(thd))
2344
 
    {
2345
 
      res= 1;
2346
 
      break;
2347
 
    }
2348
 
    if (thd->slave_thread && 
2349
 
       (!rpl_filter->db_ok(db->str) ||
2350
 
        !rpl_filter->db_ok_with_wild_table(db->str)))
2351
 
    {
2352
 
      res= 1;
2353
 
      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
2354
 
      break;
2355
 
    }
2356
 
    if (check_db_name(db))
2357
 
    {
2358
 
      my_error(ER_WRONG_DB_NAME, MYF(0), db->str);
2359
 
      break;
2360
 
    }
2361
 
    if (thd->locked_tables || thd->active_transaction())
2362
 
    {
2363
 
      res= 1;
2364
 
      my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
2365
 
                 ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
2366
 
      goto error;
2367
 
    }
2368
 
 
2369
 
    res= mysql_upgrade_db(thd, db);
2370
 
    if (!res)
2371
 
      my_ok(thd);
2372
 
    break;
2373
 
  }
2374
2340
  case SQLCOM_ALTER_DB:
2375
2341
  {
2376
2342
    LEX_STRING *db= &lex->name;