diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-02 14:01:26 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-02 14:01:26 +0400 |
| commit | e90af219d207e99911330e80a057d2c15becde5d (patch) | |
| tree | c68d67987c26b2d664b5cdab6edf6a8a37f06c58 | |
| parent | fb4c786e2fd846044cda9fd3dc783e9bca624e40 (diff) | |
| parent | 40d4c07cd0b03eff55b0eef1c05fbee975bacc0b (diff) | |
| download | mariadb-git-e90af219d207e99911330e80a057d2c15becde5d.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict configure.in
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | mysql-test/r/explain.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/explain.test | 15 |
3 files changed, 30 insertions, 2 deletions
diff --git a/configure.in b/configure.in index c2770536d1f..26f31dfd844 100644 --- a/configure.in +++ b/configure.in @@ -844,8 +844,8 @@ AC_TYPE_SIZE_T AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h ieeefp.h limits.h \ - memory.h pwd.h select.h poll.h \ +AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h fpu_control.h \ + ieeefp.h limits.h memory.h pwd.h select.h poll.h \ stdlib.h stddef.h \ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \ diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result index 7042a2c6f6c..b8dbb54e5fb 100644 --- a/mysql-test/r/explain.result +++ b/mysql-test/r/explain.result @@ -258,4 +258,17 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables DROP TABLE t1, t2; +# +# Bug #48573: difference of index selection between rpm binary and +# .tar.gz, windows vs linux.. +# +CREATE TABLE t1(c1 INT, c2 INT, c4 INT, c5 INT, KEY(c2, c5), KEY(c2, c4, c5)); +INSERT INTO t1 VALUES(4, 1, 1, 1); +INSERT INTO t1 VALUES(3, 1, 1, 1); +INSERT INTO t1 VALUES(2, 1, 1, 1); +INSERT INTO t1 VALUES(1, 1, 1, 1); +EXPLAIN SELECT c1 FROM t1 WHERE c2 = 1 AND c4 = 1 AND c5 = 1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ref c2,c2_2 c2 10 const,const 3 Using where +DROP TABLE t1; End of 5.1 tests. diff --git a/mysql-test/t/explain.test b/mysql-test/t/explain.test index 72406110de1..60108b3b038 100644 --- a/mysql-test/t/explain.test +++ b/mysql-test/t/explain.test @@ -223,4 +223,19 @@ EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT 1 FROM t1 t JOIN t2 WHERE b <= 1 AND DROP TABLE t1, t2; +--echo # +--echo # Bug #48573: difference of index selection between rpm binary and +--echo # .tar.gz, windows vs linux.. +--echo # + +CREATE TABLE t1(c1 INT, c2 INT, c4 INT, c5 INT, KEY(c2, c5), KEY(c2, c4, c5)); +INSERT INTO t1 VALUES(4, 1, 1, 1); +INSERT INTO t1 VALUES(3, 1, 1, 1); +INSERT INTO t1 VALUES(2, 1, 1, 1); +INSERT INTO t1 VALUES(1, 1, 1, 1); + +EXPLAIN SELECT c1 FROM t1 WHERE c2 = 1 AND c4 = 1 AND c5 = 1; + +DROP TABLE t1; + --echo End of 5.1 tests. |