Commit a470f42a authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-axmrg 

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/mysqld.cc:
  Manual merge
parents fd343179 660cb2fd

mysql-test/r/myisam.result

+150 −0
Original line number Diff line number Diff line
@@ -943,6 +943,156 @@ SHOW TABLE STATUS LIKE 't1'; 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100 avg_row_length=70100	

DROP TABLE t1;

CREATE TABLE t1 (c1 TEXT NOT NULL, KEY c1 (c1(10))) ENGINE=MyISAM;

INSERT INTO t1 VALUES

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

(''), (''), (''), (''),

(' B'), (' B'), (' B'), (' B');

SELECT DISTINCT COUNT(*) FROM t1 WHERE c1 = '';

COUNT(*)

4

SELECT DISTINCT length(c1), c1 FROM t1 WHERE c1 = '';

length(c1)	c1

0	

SELECT DISTINCT COUNT(*) FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

COUNT(*)

4

SELECT DISTINCT length(c1), c1 FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

length(c1)	c1

0	

SELECT DISTINCT length(c1), c1 FROM t1 ORDER BY c1;

length(c1)	c1

0	

2		A

2	 B

DROP TABLE t1;

End of 4.1 tests

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

mysql-test/t/heap_btree.test

+1 −0
Original line number Diff line number Diff line
@@ -236,3 +236,4 @@ INSERT INTO t1 VALUES(NULL),(NULL); 
DROP TABLE t1;



--echo End of 5.0 tests

mysql-test/t/myisam.test

+144 −0
Original line number Diff line number Diff line
@@ -874,6 +874,150 @@ CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100; 
SHOW TABLE STATUS LIKE 't1';

DROP TABLE t1;



#

# Bug#26231 - select count(*) on myisam table returns wrong value

#             when index is used

#

CREATE TABLE t1 (c1 TEXT NOT NULL, KEY c1 (c1(10))) ENGINE=MyISAM;

# Fill at least two key blocks. "Tab, A" must be in both blocks. 

INSERT INTO t1 VALUES

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)), (CHAR(9,65)),

  (''), (''), (''), (''),

  (' B'), (' B'), (' B'), (' B');

SELECT DISTINCT COUNT(*) FROM t1 WHERE c1 = '';

SELECT DISTINCT length(c1), c1 FROM t1 WHERE c1 = '';

SELECT DISTINCT COUNT(*) FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

SELECT DISTINCT length(c1), c1 FROM t1 IGNORE INDEX (c1) WHERE c1 = '';

SELECT DISTINCT length(c1), c1 FROM t1 ORDER BY c1;

DROP TABLE t1;



--echo End of 4.1 tests

mysql-test/t/wait_for_socket.sh

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ fi 


###########################################################################



client_args="--silent --socket=$socket_path --connect_timeout=1 "

client_args="--no-defaults --silent --socket=$socket_path --connect_timeout=1 "



[ -n "$username" ] && client_args="$client_args --user=$username "

[ -n "$password" ] && client_args="$client_args --password=$password "

sql/mysqld.cc

+2 −3
Original line number Diff line number Diff line
@@ -2346,14 +2346,13 @@ static void init_signals(void) 
#ifdef SIGTSTP

  sigaddset(&set,SIGTSTP);

#endif

  if (thd_lib_detected != THD_LIB_LT)

    sigaddset(&set,THR_SERVER_ALARM);

  if (test_flags & TEST_SIGINT)

  {

    // May be SIGINT

    sigdelset(&set, thr_kill_signal);

  }

  // For alarms

  sigdelset(&set, thr_client_alarm);

  sigprocmask(SIG_SETMASK,&set,NULL);

  pthread_sigmask(SIG_SETMASK,&set,NULL);

  DBUG_VOID_RETURN;