Commit 61e454c0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/opt/local/work/mysql-4.1-root 

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
include/my_base.h:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/select.result:
  Manual merge.
mysql-test/t/ndb_alter_table.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
sql-common/client.c:
  k	
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
parents 1be7a7af 2a1ae3a5

mysql-test/r/ndb_alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ a b c 
2	two	two

alter table t1 drop index c;

select * from t1 where b = 'two';

ERROR HY000: Table definition has changed, please retry transaction

ERROR HY000: Can't lock file (errno: 241)

select * from t1 where b = 'two';

a	b	c

2	two	two

mysql-test/t/ndb_alter_table.test

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ connection server1; 
alter table t1 drop index c;

connection server2;

# This should fail since index information is not automatically refreshed

--error 1412

--error 1015

select * from t1 where b = 'two';

select * from t1 where b = 'two';

connection server1;

mysql-test/t/ndb_basic.test

+8 −9
Original line number Diff line number Diff line
@@ -606,6 +606,14 @@ select * from t1 order by counter; 


drop table t1;



#

# BUG#14514 Creating table with packed key fails silently

#



CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

drop table t1;



# End of 4.1 tests



#
@@ -615,12 +623,3 @@ create table atablewithareallylongandirritatingname (a int); 
insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

drop table atablewithareallylongandirritatingname;
 




#

# BUG#14514

#



CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

drop table t1;

mysql-test/t/ps.test

+28 −0
Original line number Diff line number Diff line
@@ -842,4 +842,32 @@ set @@tx_isolation=default; 
execute stmt;

deallocate prepare stmt;



#

# Bug#14410 "Crash in Enum or Set type in CREATE TABLE and PS/SP"

#

# Part I. Make sure the typelib for ENUM is created in the statement memory

# root.

prepare stmt from "create temporary table t1 (letter enum('','a','b','c')

not null)";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

# Part II. Make sure that when the default value is converted to UTF-8,

# the new item is # created in the statement memory root.

set names latin1;

prepare stmt from "create table t1 (a enum('test') default 'test')

 character set utf8";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

# Cleanup

set names default;

deallocate prepare stmt;



# End of 4.1 tests

mysql-test/t/select.test

+11 −0
Original line number Diff line number Diff line
@@ -2253,6 +2253,17 @@ insert into t1 values (1,1); 
insert into t2 values (1,1),(1,2);

select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;

drop table t1,t2;



#

# Bug #14482 Server crash when subselecting from the same table

#

create table t1 (f1 int,f2 int);

insert into t1 values(1,1);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t2 values(1,1);

select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2)); 

drop table t1,t2;



# End of 4.1 tests



#