Commit b5b72271 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-qc
parents 526a67fb 32f93da0

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ lenz@mysql.com 
magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

mats@mysql.com

matt@mysql.com

matthias@three.local.lan

miguel@hegel.(none)

mysql-test/r/rpl_start_stop_slave.result

0 → 100644
+12 −0
Original line number Diff line number Diff line 
slave stop;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

stop slave;

create table t1(n int);

start slave;

stop slave io_thread;

start slave io_thread;

drop table t1;

mysql-test/t/rpl_start_stop_slave.test

0 → 100644
+34 −0
Original line number Diff line number Diff line 
source include/master-slave.inc;



#

# Bug#6148 ()

#

connection slave;

stop slave;



# Let the master do lots of insertions

connection master;

create table t1(n int);

let $1=5000;

disable_query_log;

while ($1)

{

 eval insert into t1 values($1);

 dec $1;

}

enable_query_log;

save_master_pos;



connection slave;

start slave;

sleep 1;

stop slave io_thread;

start slave io_thread;

sync_with_master;



connection master;

drop table t1;

save_master_pos;



connection slave;

sync_with_master;

sql/item_func.cc

+11 −8
Original line number Diff line number Diff line
@@ -1601,6 +1601,8 @@ longlong Item_func_bit_count::val_int() 
#ifdef HAVE_DLOPEN



udf_handler::~udf_handler()

{

  if (!not_original)

  {

    if (initialized)

    {
@@ -1615,6 +1617,7 @@ udf_handler::~udf_handler() 
    if (buffers)				// Because of bug in ecc

      delete [] buffers;

  }

}





bool

sql/item_sum.h

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ class Item_udf_sum : public Item_sum 
    :Item_sum( list ), udf(udf_arg)

  { quick_group=0;}

  Item_udf_sum(THD *thd, Item_udf_sum *item)

    :Item_sum(thd, item), udf(item->udf) {}

    :Item_sum(thd, item), udf(item->udf) { udf.not_original= TRUE; }

  const char *func_name() const { return udf.name(); }

  bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)

  {