Commit 15515ac5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alexi/bugs/mysql-5.0-16175 

into  mysql.com:/home/alexi/bugs/mysql-5.1-16175


sql/sql_db.cc:
  Auto merged
parents 5e02bec9 2281f754

sql/sql_db.cc

+10 −5
Original line number Diff line number Diff line
@@ -1226,7 +1226,8 @@ static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, 
bool mysql_change_db(THD *thd, const char *name, bool no_access_check)

{

  int length, db_length;

  char *dbname=my_strdup((char*) name,MYF(MY_WME));

  char *dbname= thd->slave_thread ? (char *) name :

                                    my_strdup((char *) name, MYF(MY_WME));

  char	path[FN_REFLEN];

  HA_CREATE_INFO create;

  bool system_db= 0;
@@ -1246,6 +1247,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) 
      system_db= 1;

      goto end;

    }

    if (!(thd->slave_thread))

      x_free(dbname);				/* purecov: inspected */

    my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR),

               MYF(0));                         /* purecov: inspected */
@@ -1254,6 +1256,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) 
  if (check_db_name(dbname))

  {

    my_error(ER_WRONG_DB_NAME, MYF(0), dbname);

    if (!(thd->slave_thread))

      x_free(dbname);

    DBUG_RETURN(1);

  }
@@ -1284,6 +1287,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) 
               dbname);

      general_log_print(thd, COM_INIT_DB, ER(ER_DBACCESS_DENIED_ERROR),

                        sctx->priv_user, sctx->priv_host, dbname);

      if (!(thd->slave_thread))

        my_free(dbname,MYF(0));

      DBUG_RETURN(1);

    }
@@ -1295,6 +1299,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) 
  if (my_access(path,F_OK))

  {

    my_error(ER_BAD_DB_ERROR, MYF(0), dbname);

    if (!(thd->slave_thread))

      my_free(dbname,MYF(0));

    DBUG_RETURN(1);

  }