Commit 1c67dea5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 


sql/sql_parse.cc:
  Auto merged
parents bc6652db dd126ba1

sql/sql_parse.cc

+6 −2
Original line number Diff line number Diff line
@@ -1573,7 +1573,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
      if (check_access(thd,CREATE_ACL,db,0,1,0))

	break;

      mysql_log.write(thd,command,packet);

      mysql_create_db(thd,(lower_case_table_names == 2 ? alias : db),0,0);

      if (mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),

                          0, 0) < 0)

        send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);

      break;

    }

  case COM_DROP_DB:				// QQ: To be removed
@@ -1594,7 +1596,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
	break;

      }

      mysql_log.write(thd,command,db);

      mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db), 0, 0);

      if (mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),

                      0, 0) < 0)

        send_error(&thd->net, thd->killed ? ER_SERVER_SHUTDOWN : 0);

      break;

    }

#ifndef EMBEDDED_LIBRARY