bzr commit into mysql-5.1 branch (joerg:2657)

[Joerg Bruehe]

#At file:///MySQL/REPO/V51/push-5.1/

 2657 Joerg Bruehe	2008-06-20 [merge]
      Pull some bug fixes from the main tree.
modified:
  client/mysql.cc
  mysql-test/r/subselect.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/t/subselect.test
  sql/sql_select.cc
  storage/innobase/Makefile.am

=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2008-03-28 18:20:21 +0000
+++ b/client/mysql.cc	2008-06-19 03:12:28 +0000
@@ -1821,7 +1821,7 @@ static int read_and_execute(bool interac
         the very beginning of a text file when
         you save the file using "Unicode UTF-8" format.
       */
-      if (!line_number &&
+      if (line && !line_number &&
            (uchar) line[0] == 0xEF &&
            (uchar) line[1] == 0xBB &&
            (uchar) line[2] == 0xBF)

=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result	2008-05-16 16:28:24 +0000
+++ b/mysql-test/r/subselect.result	2008-06-19 03:08:41 +0000
@@ -4391,3 +4391,10 @@ SELECT * FROM t1 WHERE _utf8'a' = ANY (S
 s1
 a
 DROP TABLE t1;
+CREATE TABLE t1(c int, KEY(c));
+CREATE TABLE t2(a int, b int);
+INSERT INTO t2 VALUES (1, 10), (2, NULL);
+INSERT INTO t1 VALUES (1), (3);
+SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
+a	b
+DROP TABLE t1,t2;

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-05-19 06:38:53 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-06-19 10:39:48 +0000
@@ -12,3 +12,4 @@
 
 rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
 rpl_innodb_bug28430        : Failure on Solaris Bug #36793
+rpl_server_id1             : Bug #36818 rpl_server_id1 fails expecting slave has stopped (azundris)

=== modified file 'mysql-test/t/subselect.test'
--- a/mysql-test/t/subselect.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/t/subselect.test	2008-06-19 03:08:41 +0000
@@ -3273,3 +3273,15 @@ INSERT INTO t1 VALUES ('a');
 SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
 DROP TABLE t1;
 
+#
+# Bug #37004: NOT IN subquery with MAX over an empty set
+#
+
+CREATE TABLE t1(c int, KEY(c));
+CREATE TABLE t2(a int, b int);
+INSERT INTO t2 VALUES (1, 10), (2, NULL);
+INSERT INTO t1 VALUES (1), (3);
+
+SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
+
+DROP TABLE t1,t2;

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-05-16 16:03:50 +0000
+++ b/sql/sql_select.cc	2008-06-19 03:08:41 +0000
@@ -888,6 +888,7 @@ JOIN::optimize()
       {
         DBUG_PRINT("info",("No matching min/max row"));
 	zero_result_cause= "No matching min/max row";
+        tables= 0;
 	error=0;
 	DBUG_RETURN(0);
       }
@@ -901,6 +902,7 @@ JOIN::optimize()
       {
         DBUG_PRINT("info",("No matching min/max row"));
         zero_result_cause= "No matching min/max row";
+        tables= 0;
         error=0;
         DBUG_RETURN(0);
       }

=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am	2008-05-14 08:45:32 +0000
+++ b/storage/innobase/Makefile.am	2008-06-19 04:44:22 +0000
@@ -159,7 +159,7 @@ libinnobase_a_CXXFLAGS=	$(AM_CFLAGS)
 libinnobase_a_CFLAGS  =	$(AM_CFLAGS)
 
 EXTRA_LTLIBRARIES =	ha_innodb.la
-pkglib_LTLIBRARIES =	@plugin_innobase_shared_target@
+pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
 
 ha_innodb_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN