Commit 42b630e1 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


scripts/mysqld_safe.sh:
  Auto merged
parents 68be1911 1ebdbf6f

mysql-test/r/myisam.result

+1 −22
Original line number Diff line number Diff line
@@ -922,27 +922,7 @@ SET @@myisam_repair_threads=1; 
SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	1

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

End of 4.1 tests

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

--- Testing varchar ---
@@ -1611,7 +1591,6 @@ show keys from t1; 
Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	

drop table t1;

End of 4.1 tests

create table t1 (c1 int) engine=myisam pack_keys=0;

create table t2 (c1 int) engine=myisam pack_keys=1;

create table t3 (c1 int) engine=myisam pack_keys=default;

mysql-test/r/symlink.result

+2 −0
Original line number Diff line number Diff line
@@ -132,3 +132,5 @@ select * from t1; 
a

42

drop table t1;

End of 4.1 tests

End of 5.0 tests

mysql-test/t/myisam.test

+4 −1
Original line number Diff line number Diff line
@@ -846,6 +846,10 @@ DROP TABLE t1; 
#

SET @@myisam_repair_threads=1;

SHOW VARIABLES LIKE 'myisam_repair%';



--echo End of 4.1 tests





# Test varchar

#
@@ -943,7 +947,6 @@ show keys from t1; 


drop table t1;



--echo End of 4.1 tests



#

# Bug#10056 - PACK_KEYS option take values greater than 1 while creating table

mysql-test/t/symlink.test

+3 −1
Original line number Diff line number Diff line
@@ -176,4 +176,6 @@ connection default; 
select * from t1;

drop table t1;



# End of 4.1 tests
 
--echo End of 4.1 tests



--echo End of 5.0 tests