← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1836
1836
          default_collation_schema
1837
1837
          {
1838
1838
            Lex.name= $3;
1839
 
            if (Lex.name.str == NULL && Lex.session->copy_db_to((const char*&)Lex.name.str, Lex.name.length))
 
1839
            if (Lex.name.str == NULL && Lex.session->copy_db_to(Lex.name.str, Lex.name.length))
1840
1840
              DRIZZLE_YYABORT;
1841
1841
          }
1842
1842
        ;
2000
2000
 
2001
2001
            Lex.select_lex.db=$3->db.str;
2002
2002
            if (Lex.select_lex.db == NULL &&
2003
 
                Lex.session->copy_db_to((const char*&)Lex.select_lex.db, dummy))
 
2003
                Lex.session->copy_db_to(Lex.select_lex.db, dummy))
2004
2004
            {
2005
2005
              DRIZZLE_YYABORT;
2006
2006
            }