Commit 43da0a41 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


configure.in:
  Auto merged
parents a797112c e2c29343

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ AC_SUBST(SAVE_LDFLAGS) 
AC_SUBST(SAVE_CXXLDFLAGS)

AC_SUBST(CXXLDFLAGS)



AC_PREREQ(2.57)dnl		Minimum Autoconf version required.

AC_PREREQ(2.52)dnl		Minimum Autoconf version required.



#AC_ARG_PROGRAM			# Automaticly invoked by AM_INIT_AUTOMAKE

AM_SANITY_CHECK

mysql-test/r/rpl_drop_db.result

+17 −1017

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/rpl_drop_db.test

+17 −14
Original line number Diff line number Diff line
@@ -5,30 +5,33 @@ 
connection master;



--disable_warnings

drop database if exists d1;

drop database if exists mysqltest1;

--enable_warnings

create database d1;

create table d1.t1 (n int);

insert into d1.t1 values (1);

select * from d1.t1 into outfile 'd1/f1.txt';

create table d1.t2 (n int);

create table d1.t3 (n int);

create database mysqltest1;

create table mysqltest1.t1 (n int);

insert into mysqltest1.t1 values (1);

select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';

create table mysqltest1.t2 (n int);

create table mysqltest1.t3 (n int);

--error 1010

drop database d1;

use d1;

drop database mysqltest1;

use mysqltest1;

show tables;



# test the branch of the code that deals with the query buffer overflow



--disable_query_log

let $1=1000;

while ($1)

{

  eval create table d1.t$1(n int);

  eval create table mysqltest1.t$1(n int);

  dec $1;

}

--enable_query_log



--error 1010

drop database d1;

use d1;

drop database mysqltest1;

use mysqltest1;

show tables;

use test;

create table t1 (n int);
@@ -36,7 +39,7 @@ insert into t1 values (1234); 
sync_slave_with_master;



connection slave;

use d1;

use mysqltest1;

show tables;

use test;

select * from t1;
@@ -48,5 +51,5 @@ sync_slave_with_master; 
#cleanup

connection slave;

stop slave;

system rm -rf var/master-data/d1;

system rm -rf var/master-data/mysqltest1;

sql/sql_db.cc

+9 −12
Original line number Diff line number Diff line
@@ -708,9 +708,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) 


     for (tbl= dropped_tables;tbl;tbl= tbl->next)

     {

       if (!tbl->was_dropped)

         continue;

         

       /* 3 for the quotes and the comma*/

       uint tbl_name_len= strlen(tbl->real_name) + 3;

       if (p + tbl_name_len + 1 >= p_end)

sql/sql_table.cc

+0 −3
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, 
  for (table=tables ; table ; table=table->next)

  {

    char *db=table->db;

    table->was_dropped= 0;

    mysql_ha_flush(thd, table, MYSQL_HA_CLOSE_FINAL);

    if (!close_temporary_table(thd, db, table->real_name))

    {
@@ -281,8 +280,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, 
	wrong_tables.append(',');

      wrong_tables.append(String(table->real_name,system_charset_info));

    }

    else

      table->was_dropped= 1;

  }

  thd->tmp_table_used= tmp_table_deleted;

  error= 0;