Commit 8705383a authored by unknown's avatar unknown
Browse files

Merge selena.:H:/MYSQL/bkt/mysql-5.0 

into  selena.:H:/MYSQL/bkt/mysql-5.1


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
parents 90b240e7 9dcae047

mysql-test/r/analyze.result

+9 −0
Original line number Diff line number Diff line
@@ -30,6 +30,15 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci engine myisam;

insert into t1 values ('hello');

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

drop table t1;

CREATE TABLE t1 (a int);

prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

execute stmt1;

mysql-test/r/sp.result

+24 −0
Original line number Diff line number Diff line
@@ -4046,4 +4046,28 @@ boo 
2

drop procedure bug14643_1|

drop procedure bug14643_2|

drop procedure if exists bug14304|

drop table if exists t3, t4|

create table t3(a int primary key auto_increment)|

create table t4(a int primary key auto_increment)|

create procedure bug14304()

begin

insert into t3 set a=null;

insert into t4 set a=null;

insert into t4 set a=null;

insert into t4 set a=null;

insert into t4 set a=null;

insert into t4 set a=null;

insert into t4 select null as a;

insert into t3 set a=null;

insert into t3 set a=null;

select * from t3;

end|

call bug14304()|

a

1

2

3

drop procedure bug14304|

drop table t3, t4|

drop table t1,t2;

mysql-test/t/analyze.test

+14 −0
Original line number Diff line number Diff line
@@ -39,6 +39,20 @@ check table t1; 


drop table t1;



# Bug #14902 ANALYZE TABLE fails to recognize up-to-date tables

# minimal test case to get an error.

# The problem is happening when analysing table with FT index that

# contains stopwords only. The first execution of analyze table should

# mark index statistics as up to date so that next execution of this

# statement will end up with Table is up to date status.

create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci engine myisam;

insert into t1 values ('hello');



analyze table t1;

analyze table t1;



drop table t1;



#

# procedure in PS BUG#13673

#

mysql-test/t/sp.test

+31 −0
Original line number Diff line number Diff line
@@ -4823,6 +4823,37 @@ call bug14643_2()| 
drop procedure bug14643_1|

drop procedure bug14643_2|



#

# BUG#14304: auto_increment field incorrect set in SP

#

--disable_warnings

drop procedure if exists bug14304|

drop table if exists t3, t4|

--enable_warnings



create table t3(a int primary key auto_increment)|

create table t4(a int primary key auto_increment)|



create procedure bug14304()

begin

  insert into t3 set a=null;

  insert into t4 set a=null;

  insert into t4 set a=null;

  insert into t4 set a=null;

  insert into t4 set a=null;

  insert into t4 set a=null;

  insert into t4 select null as a;

  

  insert into t3 set a=null;

  insert into t3 set a=null;

  

  select * from t3;

end|



call bug14304()|



drop procedure bug14304|

drop table t3, t4|



#

# BUG#NNNN: New bug synopsis

sql/sp_head.cc

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ int sp_head::execute(THD *thd) 
    }



    /* we should cleanup free_list and memroot, used by instruction */

    thd->free_items();

    thd->cleanup_after_query();

    free_root(&execute_mem_root, MYF(0));    



    /*