Commit 7642d181 authored by unknown's avatar unknown
Browse files

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

into  moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 8fdac9c7 ca1e4aab

mysql-test/r/func_str.result

+15 −0
Original line number Diff line number Diff line
@@ -1021,4 +1021,19 @@ select * from t1 where f1='test' and (f2= sha("TEST") or f2= sha("test")); 
f1	f2

test	a94a8fe5ccb19ba61c4c0873d391e987982fbbd3

drop table t1;

CREATE TABLE t1 (a varchar(10));

INSERT INTO t1 VALUES ('abc'), ('xyz');

SELECT a, CONCAT(a,' ',a) AS c FROM t1

HAVING LEFT(c,LENGTH(c)-INSTR(REVERSE(c)," ")) = a;

a	c

abc	abc abc

xyz	xyz xyz

SELECT a, CONCAT(a,' ',a) AS c FROM t1

HAVING LEFT(CONCAT(a,' ',a),

LENGTH(CONCAT(a,' ',a))-

INSTR(REVERSE(CONCAT(a,' ',a))," ")) = a;

a	c

abc	abc abc

xyz	xyz xyz

DROP TABLE t1;

End of 4.1 tests

mysql-test/r/odbc.result

+11 −0
Original line number Diff line number Diff line
@@ -14,3 +14,14 @@ explain select * from t1 where b is null; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables

drop table t1;

CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);

INSERT INTO t1 VALUES (NULL);

SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;

a	last_insert_id()

1	1

SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;

a	last_insert_id()

SELECT sql_no_cache a, last_insert_id() FROM t1;

a	last_insert_id()

1	1

DROP TABLE t1;

mysql-test/r/rpl_insert_id.result

+14 −0
Original line number Diff line number Diff line
@@ -73,3 +73,17 @@ CREATE TABLE t1 ( a INT UNIQUE ); 
SET FOREIGN_KEY_CHECKS=0;

INSERT INTO t1 VALUES (1),(1);

ERROR 23000: Duplicate entry '1' for key 1

drop table t1;

create table t1(a int auto_increment, key(a));

create table t2(a int);

insert into t1 (a) values (null);

insert into t2 (a) select a from t1 where a is null;

insert into t2 (a) select a from t1 where a is null;

select * from t2;

a

1

select * from t2;

a

1

drop table t1;

drop table t2;

mysql-test/t/func_str.test

+17 −0
Original line number Diff line number Diff line
@@ -681,4 +681,21 @@ select * from t1 where f1='test' and (f2= sha("test") or f2= sha("TEST")); 
select * from t1 where f1='test' and (f2= sha("TEST") or f2= sha("test"));

drop table t1;



#

# Bug#18243: REVERSE changes its argument

#



CREATE TABLE t1 (a varchar(10));

INSERT INTO t1 VALUES ('abc'), ('xyz');



SELECT a, CONCAT(a,' ',a) AS c FROM t1

  HAVING LEFT(c,LENGTH(c)-INSTR(REVERSE(c)," ")) = a;



SELECT a, CONCAT(a,' ',a) AS c FROM t1

  HAVING LEFT(CONCAT(a,' ',a),

              LENGTH(CONCAT(a,' ',a))-

                     INSTR(REVERSE(CONCAT(a,' ',a))," ")) = a;



DROP TABLE t1;

 

--echo End of 4.1 tests

mysql-test/t/odbc.test

+10 −0
Original line number Diff line number Diff line
@@ -21,4 +21,14 @@ select * from t1 where a is null; 
explain select * from t1 where b is null;

drop table t1;



#

# Bug #14553: NULL in WHERE resets LAST_INSERT_ID

#

CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);

INSERT INTO t1 VALUES (NULL);

SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;

SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;

SELECT sql_no_cache a, last_insert_id() FROM t1;

DROP TABLE t1;



# End of 4.1 tests