← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Monty Taylor
  • Date: 2008-11-12 17:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 584.
  • Revision ID: monty@inaugust.com-20081112174240-l2vg9lnzbmjc3uyk
More header cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
535
535
  uint32_t path_len;
536
536
 
537
537
  /* do not create 'information_schema' db */
538
 
  if (!my_strcasecmp(system_charset_info, db, INFORMATION_SCHEMA_NAME.str))
 
538
  if (!my_strcasecmp(system_charset_info, db, INFORMATION_SCHEMA_NAME.c_str()))
539
539
  {
540
540
    my_error(ER_DB_CREATE_EXISTS, MYF(0), db);
541
541
    return(-1);
771
771
 
772
772
  if (db && (strcmp(db, "information_schema") == 0))
773
773
  {
774
 
    my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), "", "", INFORMATION_SCHEMA_NAME.str);
 
774
    my_error(ER_DBACCESS_DENIED_ERROR, MYF(0), "", "", INFORMATION_SCHEMA_NAME.c_str());
775
775
    return(true);
776
776
  }
777
777
 
1107
1107
 
1108
1108
    session->set_db(NULL, 0);
1109
1109
  }
1110
 
  else if (new_db_name == &INFORMATION_SCHEMA_NAME)
 
1110
  else if (my_strcasecmp(system_charset_info, new_db_name->str,
 
1111
                         INFORMATION_SCHEMA_NAME.c_str()) == 0)
1111
1112
  {
1112
1113
    /*
1113
1114
      Here we must use Session::set_db(), because we want to copy
1114
1115
      INFORMATION_SCHEMA_NAME constant.
1115
1116
    */
1116
1117
 
1117
 
    session->set_db(INFORMATION_SCHEMA_NAME.str, INFORMATION_SCHEMA_NAME.length);
 
1118
    session->set_db(INFORMATION_SCHEMA_NAME.c_str(),
 
1119
                    INFORMATION_SCHEMA_NAME.length());
1118
1120
  }
1119
1121
  else
1120
1122
  {
1290
1292
  }
1291
1293
 
1292
1294
  if (my_strcasecmp(system_charset_info, new_db_name->str,
1293
 
                    INFORMATION_SCHEMA_NAME.str) == 0)
 
1295
                    INFORMATION_SCHEMA_NAME.c_str()) == 0)
1294
1296
  {
1295
1297
    /* Switch the current database to INFORMATION_SCHEMA. */
1296
 
 
1297
 
    mysql_change_db_impl(session, &INFORMATION_SCHEMA_NAME, system_charset_info);
 
1298
    /* const_cast<> is safe here: mysql_change_db_impl does a copy */
 
1299
    LEX_STRING is_name= { const_cast<char *>(INFORMATION_SCHEMA_NAME.c_str()),
 
1300
                          INFORMATION_SCHEMA_NAME.length() };
 
1301
    mysql_change_db_impl(session, &is_name, system_charset_info);
1298
1302
 
1299
1303
    return(false);
1300
1304
  }