← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-05 13:28:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2395.
  • Revision ID: olafvdspek@gmail.com-20110805132848-vvwjg6pgwf56xnsd
Use const char* instead of str_ref

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
962
962
  if (table->db.str)
963
963
  {
964
964
    ptr->setIsFqtn(true);
965
 
    ptr->setSchemaName(table->db);
 
965
    ptr->setSchemaName(table->db.str);
966
966
  }
967
967
  else if (lex->session->copy_db_to(name, name_size))
968
968
    return NULL;
969
969
  else
970
970
  {
971
971
    ptr->setIsFqtn(false);
972
 
    ptr->setSchemaName(str_ref(name, name_size));
 
972
    ptr->setSchemaName(name);
973
973
  }
974
974
 
975
975
  ptr->alias= alias_str;
976
976
  ptr->setIsAlias(alias ? true : false);
977
 
  ptr->setTableName(table->table);
 
977
  ptr->setTableName(table->table.str);
978
978
  ptr->lock_type=   lock_type;
979
979
  ptr->force_index= table_options.test(TL_OPTION_FORCE_INDEX);
980
980
  ptr->ignore_leaves= table_options.test(TL_OPTION_IGNORE_LEAVES);