bzr push into mysql-5.1-bugteam branch (Georgi.Kodinov:3421 to 3422)

[Georgi Kodinov]

 3422 Georgi Kodinov	2010-06-09 [merge]
      Merge

    modified:
      mysql-test/r/loaddata.result
      mysql-test/t/loaddata.test
      sql/net_serv.cc
      sql/sql_load.cc
 3421 Davi Arnaut	2010-06-08 [merge]
      Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
     @ config/ac-macros/ssl.m4
        Enable yaSSL thread safety if linking with the server or a
        thread safe client library. Avoids building a thread safe
        yaSSL when only building a non-thread safe client library.

    modified:
      config/ac-macros/ssl.m4
      extra/yassl/CMakeLists.txt
      extra/yassl/certs/ca-cert.pem
      extra/yassl/certs/client-cert.der
      extra/yassl/certs/client-cert.pem
      extra/yassl/certs/dsa-cert.pem
      extra/yassl/certs/server-cert.pem
      extra/yassl/include/lock.hpp
      extra/yassl/src/Makefile.am
      extra/yassl/src/lock.cpp
      extra/yassl/taocrypt/CMakeLists.txt
      extra/yassl/taocrypt/benchmark/Makefile.am
      extra/yassl/taocrypt/src/Makefile.am
      extra/yassl/taocrypt/test/Makefile.am
      extra/yassl/taocrypt/test/memory.cpp
      extra/yassl/testsuite/Makefile.am
      include/my_sys.h
=== modified file 'mysql-test/r/loaddata.result'
--- a/mysql-test/r/loaddata.result	2010-05-03 16:14:39 +0000
+++ b/mysql-test/r/loaddata.result	2010-06-09 08:29:27 +0000
@@ -496,4 +496,11 @@ SELECT * FROM t1;
 col0
 test
 DROP TABLE t1;
+#
+# Bug #52512 : Assertion `! is_set()' in 
+#  Diagnostics_area::set_ok_status on LOAD DATA
+#
+CREATE TABLE t1 (id INT NOT NULL);
+LOAD DATA LOCAL INFILE 'tb.txt' INTO TABLE t1;
+DROP TABLE t1;
 End of 5.1 tests

=== modified file 'mysql-test/t/loaddata.test'
--- a/mysql-test/t/loaddata.test	2010-05-03 16:14:39 +0000
+++ b/mysql-test/t/loaddata.test	2010-06-09 08:29:27 +0000
@@ -560,4 +560,24 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 remove_file $MYSQLD_DATADIR/test/t1.txt;
 
 
+--echo #
+--echo # Bug #52512 : Assertion `! is_set()' in 
+--echo #  Diagnostics_area::set_ok_status on LOAD DATA
+--echo #
+
+connect (con1,localhost,root,,test);
+
+CREATE TABLE t1 (id INT NOT NULL);
+--send LOAD DATA LOCAL INFILE 'tb.txt' INTO TABLE t1
+# please keep this is a spearate test file : it's important to have no
+# commands after this one
+
+connection default;
+dirty_close con1;
+
+connect (con1,localhost,root,,test);
+DROP TABLE t1;
+connection default;
+disconnect con1;
+
 --echo End of 5.1 tests

=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2010-05-26 15:13:02 +0000
+++ b/sql/net_serv.cc	2010-06-09 08:29:27 +0000
@@ -902,7 +902,13 @@ my_real_read(NET *net, size_t *complen)
 		       ("Packets out of order (Found: %d, expected %u)",
 			(int) net->buff[net->where_b + 3],
 			net->pkt_nr));
-#ifdef EXTRA_DEBUG
+            /* 
+              We don't make noise server side, since the client is expected
+              to break the protocol for e.g. --send LOAD DATA .. LOCAL where
+              the server expects the client to send a file, but the client
+              may reply with a new command instead.
+            */
+#if defined (EXTRA_DEBUG) && !defined (MYSQL_SERVER)
             fflush(stdout);
 	    fprintf(stderr,"Error: Packets out of order (Found: %d, expected %d)\n",
 		    (int) net->buff[net->where_b + 3],

=== modified file 'sql/sql_load.cc'
--- a/sql/sql_load.cc	2010-05-08 03:25:33 +0000
+++ b/sql/sql_load.cc	2010-06-09 08:29:27 +0000
@@ -933,6 +933,10 @@ read_sep_field(THD *thd, COPY_INFO &info
         DBUG_RETURN(1);
       }
     }
+
+    if (thd->is_error())
+      read_info.error= 1;
+
     if (read_info.error)
       break;
     if (skip_lines)


Attachment: [text/bzr-bundle] bzr/[e-mail]