← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Olaf van der Spek
  • Date: 2011-07-05 14:57:10 UTC
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110705145710-t2pjljyzrsq0vju2
Refactor copy_db_to

Show diffs side-by-side

added added

removed removed

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