← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Merge Stewart's basic discovery branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1447
1447
storage_engines:
1448
1448
          ident_or_text
1449
1449
          {
1450
 
            StorageEngine *engine= ha_resolve_by_name(YYSession, &$1);
 
1450
            const std::string engine_name($1.str);
 
1451
            StorageEngine *engine= ha_resolve_by_name(YYSession, engine_name);
1451
1452
 
1452
1453
            if (engine)
1453
1454
              $$= engine;
1462
1463
known_storage_engines:
1463
1464
          ident_or_text
1464
1465
          {
 
1466
            const std::string engine_name($1.str);
1465
1467
            StorageEngine *engine;
1466
 
            if ((engine= ha_resolve_by_name(YYSession, &$1)))
 
1468
            if ((engine= ha_resolve_by_name(YYSession, engine_name)))
1467
1469
              $$= engine;
1468
1470
            else
1469
1471
            {