← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2009-04-09 15:03:26 UTC
  • mfrom: (971.1.44 mordred)
  • Revision ID: brian@gaz-20090409150326-cu50yn12esijpy1c
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1455
1455
storage_engines:
1456
1456
          ident_or_text
1457
1457
          {
1458
 
            st_plugin_int *plugin= ha_resolve_by_name(YYSession, &$1);
 
1458
            StorageEngine *engine= ha_resolve_by_name(YYSession, &$1);
1459
1459
 
1460
 
            if (plugin)
1461
 
              $$= static_cast<StorageEngine *>(plugin->data);
 
1460
            if (engine)
 
1461
              $$= engine;
1462
1462
            else
1463
1463
            {
1464
1464
              my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
1470
1470
known_storage_engines:
1471
1471
          ident_or_text
1472
1472
          {
1473
 
            st_plugin_int *plugin;
1474
 
            if ((plugin= ha_resolve_by_name(YYSession, &$1)))
1475
 
              $$= static_cast<StorageEngine *>(plugin->data);
 
1473
            StorageEngine *engine;
 
1474
            if ((engine= ha_resolve_by_name(YYSession, &$1)))
 
1475
              $$= engine;
1476
1476
            else
1477
1477
            {
1478
1478
              my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);