Commit bb22e366 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

Merge gleb.loc:/home/uchum/work/bk/5.0 

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents 4c208499 2c9eb163

client/mysqldump.c

+4 −3
Original line number Diff line number Diff line
@@ -2122,8 +2122,7 @@ static void dump_triggers_for_table(char *table, 
  }

  if (mysql_num_rows(result))

  {

    if (opt_compact)

      fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n");

    fprintf(sql_file, "\n/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;\n");

    fprintf(sql_file, "\nDELIMITER ;;\n");

  }

  while ((row= mysql_fetch_row(result)))
@@ -2167,9 +2166,11 @@ static void dump_triggers_for_table(char *table, 
            row[3] /* Statement */);

  }

  if (mysql_num_rows(result))

  {

    fprintf(sql_file,

            "DELIMITER ;\n"

            "/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n");

            "/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;\n");

  }

  mysql_free_result(result);

  /*

    make sure to set back opt_compatible mode to

mysql-test/r/create.result

+13 −0
Original line number Diff line number Diff line
@@ -1519,4 +1519,17 @@ create table t2(a int not null, b int not null, c int not null, primary key (a), 
foreign key fk_bug26104 (b,c) references t1(a));

ERROR 42000: Incorrect foreign key definition for 'fk_bug26104': Key reference and table reference don't match

drop table t1;

create table t1(f1 int,f2 int);

insert into t1 value(1,1),(1,2),(1,3),(2,1),(2,2),(2,3);

flush status;

create table t2 select sql_big_result f1,count(f2) from t1 group by f1;

show status like 'handler_read%';

Variable_name	Value

Handler_read_first	0

Handler_read_key	0

Handler_read_next	0

Handler_read_prev	0

Handler_read_rnd	0

Handler_read_rnd_next	7

drop table t1,t2;

End of 5.0 tests

mysql-test/r/having.result

+19 −0
Original line number Diff line number Diff line
@@ -158,6 +158,25 @@ EXPLAIN SELECT 0 AS x, a FROM t1 GROUP BY x,a HAVING x=1 AND a > 1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible HAVING

DROP table t1;

CREATE TABLE t1 (a int PRIMARY KEY);

CREATE TABLE t2 (b int PRIMARY KEY, a int);

CREATE TABLE t3 (b int, flag int);

INSERT INTO t1 VALUES (1);

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

INSERT INTO t3(b,flag) VALUES (2, 1);

SELECT t1.a

FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b

GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;

a

SELECT DISTINCT t1.a, MAX(t3.flag)

FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b

GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;

a	MAX(t3.flag)

SELECT DISTINCT t1.a

FROM t1 INNER JOIN t2 ON t1.a=t2.a LEFT JOIN t3 ON t2.b=t3.b

GROUP BY t1.a, t2.b HAVING MAX(t3.flag)=0;

a

DROP TABLE t1,t2,t3;

create table t1 (col1 int, col2 varchar(5), col_t1 int);

create table t2 (col1 int, col2 varchar(5), col_t2 int);

create table t3 (col1 int, col2 varchar(5), col_t3 int);

mysql-test/r/innodb_mysql.result

+268 −0
Original line number Diff line number Diff line
@@ -739,4 +739,272 @@ drop table if exists t1; 
create table t1 (a int) engine=innodb;

alter table t1 alter a set default 1;

drop table t1;

CREATE TABLE t1 (a int, b int, PRIMARY KEY (a), KEY bkey (b)) ENGINE=InnoDB;

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

INSERT INTO t1 SELECT a + 8, 2 FROM t1;

INSERT INTO t1 SELECT a + 16, 1 FROM t1;

EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a;

id	1

select_type	SIMPLE

table	t1

type	ref

possible_keys	bkey

key	bkey

key_len	5

ref	const

rows	16

Extra	Using where; Using index

SELECT * FROM t1 WHERE b=2 ORDER BY a;

a	b

1	2

2	2

3	2

4	2

5	2

6	2

7	2

8	2

9	2

10	2

11	2

12	2

13	2

14	2

15	2

16	2

EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;

id	1

select_type	SIMPLE

table	t1

type	range

possible_keys	bkey

key	bkey

key_len	5

ref	NULL

rows	16

Extra	Using where; Using index; Using filesort

SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;

a	b

1	2

2	2

3	2

4	2

5	2

6	2

7	2

8	2

9	2

10	2

11	2

12	2

13	2

14	2

15	2

16	2

17	1

18	1

19	1

20	1

21	1

22	1

23	1

24	1

25	1

26	1

27	1

28	1

29	1

30	1

31	1

32	1

EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;

id	1

select_type	SIMPLE

table	t1

type	range

possible_keys	bkey

key	bkey

key_len	5

ref	NULL

rows	16

Extra	Using where; Using index

SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY b,a;

a	b

17	1

18	1

19	1

20	1

21	1

22	1

23	1

24	1

25	1

26	1

27	1

28	1

29	1

30	1

31	1

32	1

1	2

2	2

3	2

4	2

5	2

6	2

7	2

8	2

9	2

10	2

11	2

12	2

13	2

14	2

15	2

16	2

CREATE TABLE t2 (a int, b int, c int, PRIMARY KEY (a), KEY bkey (b,c))

ENGINE=InnoDB;

INSERT INTO t2 VALUES (1,1,1),(3,1,1),(2,1,1),(4,1,1);

INSERT INTO t2 SELECT a + 4, 1, 1 FROM t2;

INSERT INTO t2 SELECT a + 8, 1, 1 FROM t2;

EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a;

id	1

select_type	SIMPLE

table	t2

type	ref

possible_keys	bkey

key	bkey

key_len	5

ref	const

rows	8

Extra	Using where; Using index; Using filesort

SELECT * FROM t2 WHERE b=1 ORDER BY a;

a	b	c

1	1	1

2	1	1

3	1	1

4	1	1

5	1	1

6	1	1

7	1	1

8	1	1

9	1	1

10	1	1

11	1	1

12	1	1

13	1	1

14	1	1

15	1	1

16	1	1

EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;

id	1

select_type	SIMPLE

table	t2

type	ref

possible_keys	bkey

key	bkey

key_len	10

ref	const,const

rows	8

Extra	Using where; Using index

SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY a;

a	b	c

1	1	1

2	1	1

3	1	1

4	1	1

5	1	1

6	1	1

7	1	1

8	1	1

9	1	1

10	1	1

11	1	1

12	1	1

13	1	1

14	1	1

15	1	1

16	1	1

EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;

id	1

select_type	SIMPLE

table	t2

type	ref

possible_keys	bkey

key	bkey

key_len	10

ref	const,const

rows	8

Extra	Using where; Using index

SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY b,c,a;

a	b	c

1	1	1

2	1	1

3	1	1

4	1	1

5	1	1

6	1	1

7	1	1

8	1	1

9	1	1

10	1	1

11	1	1

12	1	1

13	1	1

14	1	1

15	1	1

16	1	1

EXPLAIN SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;

id	1

select_type	SIMPLE

table	t2

type	ref

possible_keys	bkey

key	bkey

key_len	10

ref	const,const

rows	8

Extra	Using where; Using index

SELECT * FROM t2 WHERE b=1 AND c=1 ORDER BY c,a;

a	b	c

1	1	1

2	1	1

3	1	1

4	1	1

5	1	1

6	1	1

7	1	1

8	1	1

9	1	1

10	1	1

11	1	1

12	1	1

13	1	1

14	1	1

15	1	1

16	1	1

DROP TABLE t1,t2;

CREATE TABLE t1 (a INT, PRIMARY KEY (a)) ENGINE=InnoDB;

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

INSERT INTO t1 SELECT a + 8  FROM t1;

INSERT INTO t1 SELECT a + 16 FROM t1;

CREATE PROCEDURE p1 ()

BEGIN

DECLARE i INT DEFAULT 50;

DECLARE cnt INT;

START TRANSACTION;

ALTER TABLE t1 ENGINE=InnoDB;

COMMIT;

START TRANSACTION;

WHILE (i > 0) DO

SET i = i - 1;

SELECT COUNT(*) INTO cnt FROM t1 LOCK IN SHARE MODE;

END WHILE;

COMMIT;

END;|

CALL p1();

CALL p1();

CALL p1();

DROP PROCEDURE p1;

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/mysqldump.result

+34 −4
Original line number Diff line number Diff line
@@ -2238,6 +2238,8 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL),(4,NULL),(11,NULL); 
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

UNLOCK TABLES;



/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;



DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg1` BEFORE INSERT ON `t1` FOR EACH ROW begin
@@ -2260,7 +2262,7 @@ end if; 
end */;;



DELIMITER ;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;

/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` int(11) default NULL
@@ -2271,6 +2273,8 @@ LOCK TABLES `t2` WRITE; 
/*!40000 ALTER TABLE `t2` ENABLE KEYS */;

UNLOCK TABLES;



/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;



DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `trg4` BEFORE INSERT ON `t2` FOR EACH ROW begin
@@ -2280,7 +2284,7 @@ end if; 
end */;;



DELIMITER ;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;

/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -2628,13 +2632,15 @@ INSERT INTO "t1 test" VALUES (1),(2),(3); 
/*!40000 ALTER TABLE "t1 test" ENABLE KEYS */;

UNLOCK TABLES;



/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;



DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `test trig` BEFORE INSERT ON `t1 test` FOR EACH ROW BEGIN

INSERT INTO `t2 test` SET a2 = NEW.a1; END */;;



DELIMITER ;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;

/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;

DROP TABLE IF EXISTS "t2 test";

CREATE TABLE "t2 test" (

  "a2" int(11) default NULL
@@ -2788,6 +2794,8 @@ LOCK TABLES `t1` WRITE; 
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

UNLOCK TABLES;



/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;



DELIMITER ;;

/*!50003 SET SESSION SQL_MODE="IGNORE_SPACE" */;;

/*!50003 CREATE */ /*!50017 DEFINER=`root`@`localhost` */ /*!50003 TRIGGER `tr1` BEFORE INSERT ON `t1` FOR EACH ROW BEGIN
@@ -2795,7 +2803,7 @@ SET new.a = 0; 
END */;;



DELIMITER ;

/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;

/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -3334,5 +3342,27 @@ SELECT * FROM v1; 
1

DROP VIEW v1;

#

# Bug #29788: mysqldump discards the NO_AUTO_VALUE_ON_ZERO value of

#             the SQL_MODE variable after the dumping of triggers.

#

CREATE TABLE t1 (c1 INT);

CREATE TRIGGER t1bd BEFORE DELETE ON t1 FOR EACH ROW BEGIN END;

CREATE TABLE t2 (c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY);

SET @TMP_SQL_MODE = @@SQL_MODE;

SET SQL_MODE = 'NO_AUTO_VALUE_ON_ZERO';

INSERT INTO t2 VALUES (0), (1), (2);

SET SQL_MODE = @TMP_SQL_MODE;

SELECT * FROM t2;

c1

0

1

2

SELECT * FROM t2;

c1

0

1

2

DROP TABLE t1,t2;

#

# End of 5.0 tests

#