Commit 428830c5 authored by unknown's avatar unknown
Browse files

After merge fixes 

Better fix for ON DUPLICATE KEY UPDATE


mysql-test/r/group_by.result:
  After merge fixes
mysql-test/r/select.result:
  Reorder test to match 4.1 tests (will make future merges easier)
mysql-test/t/group_by.test:
  Added --disable_ps_protocol to avoid extra warning
mysql-test/t/select.test:
  Reorder test to match 4.1 tests (will make future merges easier)
sql/mysql_priv.h:
  Better fix for ON DUPLICATE KEY UPDATE
sql/sql_base.cc:
  After merge fixes
sql/sql_insert.cc:
  Better fix for ON DUPLICATE KEY UPDATE
  (old solution gave problem with item->cached_table)
sql/sql_prepare.cc:
  Better fix for ON DUPLICATE KEY UPDATE
parent eeee5fb1

mysql-test/r/group_by.result

+4 −2
Original line number Diff line number Diff line
@@ -721,13 +721,15 @@ SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1 
WHERE hostname LIKE '%aol%'

    GROUP BY hostname;

hostname	no

cache-dtc-af05.proxy.aol.com	1

DROP TABLE t1;

CREATE TABLE t1 (n int);

INSERT INTO t1 VALUES (1);

SELECT n+1 AS n FROM t1 GROUP BY n;

n

2

DROP TABLE t1;

cache-dtc-af05.proxy.aol.com	1

Warnings:

Warning	1052	Column 'n' in group statement is ambiguous

DROP TABLE t1;

CREATE TABLE t1 (a  int, b int);

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

mysql-test/r/select.result

+118 −118
Original line number Diff line number Diff line
@@ -2423,12 +2423,130 @@ ERROR HY000: Incorrect usage of ALL and DISTINCT 
select distinct all * from t1;

ERROR HY000: Incorrect usage of ALL and DISTINCT

drop table t1;

CREATE TABLE t1 (

kunde_intern_id int(10) unsigned NOT NULL default '0',

kunde_id int(10) unsigned NOT NULL default '0',

FK_firma_id int(10) unsigned NOT NULL default '0',

aktuell enum('Ja','Nein') NOT NULL default 'Ja',

vorname varchar(128) NOT NULL default '',

nachname varchar(128) NOT NULL default '',

geloescht enum('Ja','Nein') NOT NULL default 'Nein',

firma varchar(128) NOT NULL default ''

);

INSERT INTO t1 VALUES 

(3964,3051,1,'Ja','Vorname1','1Nachname','Nein','Print Schau XXXX'),

(3965,3051111,1,'Ja','Vorname1111','1111Nachname','Nein','Print Schau XXXX');

SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname, geloescht FROM t1

WHERE

(

(

( '' != '' AND firma LIKE CONCAT('%', '', '%'))

OR

(vorname LIKE CONCAT('%', 'Vorname1', '%') AND 

nachname LIKE CONCAT('%', '1Nachname', '%') AND 

'Vorname1' != '' AND 'xxxx' != '')

)

AND

(

aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

)

)

;

kunde_id	FK_firma_id	aktuell	vorname	nachname	geloescht

SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname,

geloescht FROM t1

WHERE

(

(

aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

)

AND

(

( '' != '' AND firma LIKE CONCAT('%', '', '%')  )

OR

(  vorname LIKE CONCAT('%', 'Vorname1', '%') AND

nachname LIKE CONCAT('%', '1Nachname', '%') AND 'Vorname1' != '' AND

'xxxx' != '')

)

)

;

kunde_id	FK_firma_id	aktuell	vorname	nachname	geloescht

SELECT COUNT(*) FROM t1 WHERE 

( 0 OR (vorname LIKE '%Vorname1%' AND nachname LIKE '%1Nachname%' AND 1)) 

AND FK_firma_id = 2;

COUNT(*)

0

drop table t1;

CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));

INSERT INTO t1 VALUES (0x8000000000000000);

SELECT b FROM t1 WHERE b=0x8000000000000000;

b

9223372036854775808

DROP TABLE t1;

CREATE TABLE `t1` ( `gid` int(11) default NULL, `uid` int(11) default NULL);

CREATE TABLE `t2` ( `ident` int(11) default NULL, `level` char(16) default NULL);

INSERT INTO `t2` VALUES (0,'READ');

CREATE TABLE `t3` ( `id` int(11) default NULL, `name` char(16) default NULL);

INSERT INTO `t3` VALUES (1,'fs');

select * from t3 left join t1 on t3.id = t1.uid, t2 where t2.ident in (0, t1.gid, t3.id, 0);

id	name	gid	uid	ident	level

1	fs	NULL	NULL	0	READ

drop table t1,t2,t3;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');

SELECT * FROM t1 WHERE city='London';

city

London

SELECT * FROM t1 WHERE city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city='London' AND city='london';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city='London' AND city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

city

London

DROP TABLE t1;

create table t1 (a int(11) unsigned, b int(11) unsigned);

insert into t1 values (1,0), (1,1), (1,2);

select a-b  from t1 order by 1;

a-b

0

1

18446744073709551615

select a-b , (a-b < 0)  from t1 order by 1;

a-b	(a-b < 0)

0	0

1	0

18446744073709551615	0

select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;

d	(a-b >= 0)	b

1	1	0

0	1	1

18446744073709551615	1	2

select cast((a - b) as unsigned) from t1 order by 1;

cast((a - b) as unsigned)

0

1

18446744073709551615

drop table t1;

create table t1 (a int(11));

select all all * from t1;

a

select distinct distinct * from t1;

a

select all distinct * from t1;

ERROR HY000: Incorrect usage of ALL and DISTINCT

select distinct all * from t1;

ERROR HY000: Incorrect usage of ALL and DISTINCT

drop table t1;

CREATE TABLE t1 ( 

K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 

K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000',
@@ -2573,124 +2691,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	

1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	

DROP TABLE t1, t2;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');

SELECT * FROM t1 WHERE city='London';

city

London

SELECT * FROM t1 WHERE city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city='London' AND city='london';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city='London' AND city='london';

city

London

EXPLAIN SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

city

London

DROP TABLE t1;

create table t1 (a int(11) unsigned, b int(11) unsigned);

insert into t1 values (1,0), (1,1), (1,2);

select a-b  from t1 order by 1;

a-b

0

1

18446744073709551615

select a-b , (a-b < 0)  from t1 order by 1;

a-b	(a-b < 0)

0	0

1	0

18446744073709551615	0

select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;

d	(a-b >= 0)	b

1	1	0

0	1	1

18446744073709551615	1	2

select cast((a - b) as unsigned) from t1 order by 1;

cast((a - b) as unsigned)

0

1

18446744073709551615

drop table t1;

create table t1 (a int(11));

select all all * from t1;

a

select distinct distinct * from t1;

a

select all distinct * from t1;

ERROR HY000: Incorrect usage of ALL and DISTINCT

select distinct all * from t1;

ERROR HY000: Incorrect usage of ALL and DISTINCT

drop table t1;

CREATE TABLE t1 (

kunde_intern_id int(10) unsigned NOT NULL default '0',

kunde_id int(10) unsigned NOT NULL default '0',

FK_firma_id int(10) unsigned NOT NULL default '0',

aktuell enum('Ja','Nein') NOT NULL default 'Ja',

vorname varchar(128) NOT NULL default '',

nachname varchar(128) NOT NULL default '',

geloescht enum('Ja','Nein') NOT NULL default 'Nein',

firma varchar(128) NOT NULL default ''

);

INSERT INTO t1 VALUES 

(3964,3051,1,'Ja','Vorname1','1Nachname','Nein','Print Schau XXXX'),

(3965,3051111,1,'Ja','Vorname1111','1111Nachname','Nein','Print Schau XXXX');

SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname, geloescht FROM t1

WHERE

(

(

( '' != '' AND firma LIKE CONCAT('%', '', '%'))

OR

(vorname LIKE CONCAT('%', 'Vorname1', '%') AND 

nachname LIKE CONCAT('%', '1Nachname', '%') AND 

'Vorname1' != '' AND 'xxxx' != '')

)

AND

(

aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

)

)

;

kunde_id	FK_firma_id	aktuell	vorname	nachname	geloescht

SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname,

geloescht FROM t1

WHERE

(

(

aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

)

AND

(

( '' != '' AND firma LIKE CONCAT('%', '', '%')  )

OR

(  vorname LIKE CONCAT('%', 'Vorname1', '%') AND

nachname LIKE CONCAT('%', '1Nachname', '%') AND 'Vorname1' != '' AND

'xxxx' != '')

)

)

;

kunde_id	FK_firma_id	aktuell	vorname	nachname	geloescht

SELECT COUNT(*) FROM t1 WHERE 

( 0 OR (vorname LIKE '%Vorname1%' AND nachname LIKE '%1Nachname%' AND 1)) 

AND FK_firma_id = 2;

COUNT(*)

0

CREATE TABLE `t1` ( `gid` int(11) default NULL, `uid` int(11) default NULL);

CREATE TABLE `t2` ( `ident` int(11) default NULL, `level` char(16) default NULL);

INSERT INTO `t2` VALUES (0,'READ');

CREATE TABLE `t3` ( `id` int(11) default NULL, `name` char(16) default NULL);

INSERT INTO `t3` VALUES (1,'fs');

select * from t3 left join t1 on t3.id = t1.uid, t2 where t2.ident in (0, t1.gid, t3.id, 0);

id	name	gid	uid	ident	level

1	fs	NULL	NULL	0	READ

drop table t1,t2,t3;

drop table t1;

CREATE TABLE t1 (a int);

CREATE TABLE t2 (a int);

INSERT INTO t1 VALUES (1), (2), (3), (4), (5);

mysql-test/t/group_by.test

+2 −2
Original line number Diff line number Diff line
@@ -550,9 +550,9 @@ DROP TABLE t1; 
                    

CREATE TABLE t1 (n int);

INSERT INTO t1 VALUES (1);



--disable_ps_protocol

SELECT n+1 AS n FROM t1 GROUP BY n;



--enable_ps_protocol

DROP TABLE t1;



# Test for bug #8614: GROUP BY 'const' with DISTINCT

mysql-test/t/select.test

+102 −103
Original line number Diff line number Diff line
@@ -1954,7 +1954,6 @@ EXPLAIN SELECT * FROM t1 LEFT JOIN t2 FORCE INDEX (a) ON t1.a=t2.a; 


DROP TABLE t1, t2;





#

# Test case for bug 7098: substitution of a constant for a string field 

#
@@ -1998,6 +1997,64 @@ select distinct all * from t1; 
drop table t1;



#

# Test for BUG#10095

#

CREATE TABLE t1 (

  kunde_intern_id int(10) unsigned NOT NULL default '0',

  kunde_id int(10) unsigned NOT NULL default '0',

  FK_firma_id int(10) unsigned NOT NULL default '0',

  aktuell enum('Ja','Nein') NOT NULL default 'Ja',

  vorname varchar(128) NOT NULL default '',

  nachname varchar(128) NOT NULL default '',

  geloescht enum('Ja','Nein') NOT NULL default 'Nein',

  firma varchar(128) NOT NULL default ''

);



INSERT INTO t1 VALUES 

  (3964,3051,1,'Ja','Vorname1','1Nachname','Nein','Print Schau XXXX'),

  (3965,3051111,1,'Ja','Vorname1111','1111Nachname','Nein','Print Schau XXXX');





SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname, geloescht FROM t1

  WHERE

   (

      (

         ( '' != '' AND firma LIKE CONCAT('%', '', '%'))

         OR

         (vorname LIKE CONCAT('%', 'Vorname1', '%') AND 

          nachname LIKE CONCAT('%', '1Nachname', '%') AND 

          'Vorname1' != '' AND 'xxxx' != '')

      )

      AND

      (

        aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

      )

   )

 ;



SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname,

geloescht FROM t1

  WHERE

   (

     (

       aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

     )

     AND

     (

         ( '' != '' AND firma LIKE CONCAT('%', '', '%')  )

         OR

         (  vorname LIKE CONCAT('%', 'Vorname1', '%') AND

nachname LIKE CONCAT('%', '1Nachname', '%') AND 'Vorname1' != '' AND

'xxxx' != '')

     )

   )

 ;



SELECT COUNT(*) FROM t1 WHERE 

( 0 OR (vorname LIKE '%Vorname1%' AND nachname LIKE '%1Nachname%' AND 1)) 

AND FK_firma_id = 2;



drop table t1;



#

# Test for Bug#8009, SELECT failed on bigint unsigned when using HEX
@@ -2022,6 +2079,50 @@ INSERT INTO `t3` VALUES (1,'fs'); 
select * from t3 left join t1 on t3.id = t1.uid, t2 where t2.ident in (0, t1.gid, t3.id, 0);



drop table t1,t2,t3;



#

# Test case for bug 7098: substitution of a constant for a string field 

#



CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');



SELECT * FROM t1 WHERE city='London';

SELECT * FROM t1 WHERE city='london';

EXPLAIN SELECT * FROM t1 WHERE city='London' AND city='london';

SELECT * FROM t1 WHERE city='London' AND city='london';

EXPLAIN SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';



DROP TABLE t1;



#

# Bug#7425 inconsistent sort order on unsigned columns result of substraction

#



create table t1 (a int(11) unsigned, b int(11) unsigned);

insert into t1 values (1,0), (1,1), (1,2);

select a-b  from t1 order by 1;

select a-b , (a-b < 0)  from t1 order by 1;

select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;

select cast((a - b) as unsigned) from t1 order by 1;

drop table t1;





#

# Bug#8733 server accepts malformed query (multiply mentioned distinct)

#

create table t1 (a int(11));

select all all * from t1;

select distinct distinct * from t1;

--error 1221

select all distinct * from t1;

--error 1221

select distinct all * from t1;

drop table t1;



#

# Test for bug #6474

#
@@ -2168,108 +2269,6 @@ EXPLAIN SELECT * FROM t1 LEFT JOIN t2 FORCE INDEX (a) ON t1.a=t2.a; 


DROP TABLE t1, t2;



#

# Test case for bug 7098: substitution of a constant for a string field 

#



CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');



SELECT * FROM t1 WHERE city='London';

SELECT * FROM t1 WHERE city='london';

EXPLAIN SELECT * FROM t1 WHERE city='London' AND city='london';

SELECT * FROM t1 WHERE city='London' AND city='london';

EXPLAIN SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';

SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';



DROP TABLE t1;



#

# Bug#7425 inconsistent sort order on unsigned columns result of substraction

#



create table t1 (a int(11) unsigned, b int(11) unsigned);

insert into t1 values (1,0), (1,1), (1,2);

select a-b  from t1 order by 1;

select a-b , (a-b < 0)  from t1 order by 1;

select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;

select cast((a - b) as unsigned) from t1 order by 1;

drop table t1;





#

# Bug#8733 server accepts malformed query (multiply mentioned distinct)

#

create table t1 (a int(11));

select all all * from t1;

select distinct distinct * from t1;

--error 1221

select all distinct * from t1;

--error 1221

select distinct all * from t1;

drop table t1;



#

# Test for BUG#10095

#

CREATE TABLE t1 (

  kunde_intern_id int(10) unsigned NOT NULL default '0',

  kunde_id int(10) unsigned NOT NULL default '0',

  FK_firma_id int(10) unsigned NOT NULL default '0',

  aktuell enum('Ja','Nein') NOT NULL default 'Ja',

  vorname varchar(128) NOT NULL default '',

  nachname varchar(128) NOT NULL default '',

  geloescht enum('Ja','Nein') NOT NULL default 'Nein',

  firma varchar(128) NOT NULL default ''

);



INSERT INTO t1 VALUES 

  (3964,3051,1,'Ja','Vorname1','1Nachname','Nein','Print Schau XXXX'),

  (3965,3051111,1,'Ja','Vorname1111','1111Nachname','Nein','Print Schau XXXX');





SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname, geloescht FROM t1

  WHERE

   (

      (

         ( '' != '' AND firma LIKE CONCAT('%', '', '%'))

         OR

         (vorname LIKE CONCAT('%', 'Vorname1', '%') AND 

          nachname LIKE CONCAT('%', '1Nachname', '%') AND 

          'Vorname1' != '' AND 'xxxx' != '')

      )

      AND

      (

        aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

      )

   )

 ;



SELECT kunde_id ,FK_firma_id ,aktuell, vorname, nachname,

geloescht FROM t1

  WHERE

   (

     (

       aktuell = 'Ja' AND geloescht = 'Nein' AND FK_firma_id = 2

     )

     AND

     (

         ( '' != '' AND firma LIKE CONCAT('%', '', '%')  )

         OR

         (  vorname LIKE CONCAT('%', 'Vorname1', '%') AND

nachname LIKE CONCAT('%', '1Nachname', '%') AND 'Vorname1' != '' AND

'xxxx' != '')

     )

   )

 ;



SELECT COUNT(*) FROM t1 WHERE 

( 0 OR (vorname LIKE '%Vorname1%' AND nachname LIKE '%1Nachname%' AND 1)) 

AND FK_firma_id = 2;



drop table t1;



#

# Test for bug #10084: STRAIGHT_JOIN with ON expression 

#

sql/mysql_priv.h

+1 −2
Original line number Diff line number Diff line
@@ -717,8 +717,7 @@ bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, 
                        COND *conds, ulong options,

                        enum enum_duplicates handle_duplicates, bool ignore,

                        SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex);

bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,

			  TABLE_LIST *dup_table_list, TABLE *table,

bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table,

                          List<Item> &fields, List_item *values,

                          List<Item> &update_fields,

                          List<Item> &update_values, enum_duplicates duplic,