Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51


include/mysql.h:
  Auto merged
include/mysql_h.ic:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  Manual merge

Makefile.am

@@ -103,8 +103,10 @@ dist-hook:
 tags:
 	support-files/build-tags
 
-.PHONY:	init-db bin-dist test test-full test-ps test-nr \
-	test-ns test-pr test-unit
+.PHONY:	init-db bin-dist \
+  test    test-force    test-full    test-force-full    test-force-mem \
+  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
+  test-unit test-ps test-nr test-pr test-ns test-binlog-statement
 
 # Target 'test' will run the regression test suite using the built server.
 #
@@ -119,23 +121,23 @@ test-unit:
 
 test-ps:
 	cd mysql-test ; \
-	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
+	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
 
 test-nr:
 	cd mysql-test ; \
-	./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
+	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
 
 test-pr:
 	cd mysql-test ; \
-	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row
+	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row
 
 test-ns:
 	cd mysql-test ; \
-	./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed
+	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed
 
 test-binlog-statement:
 	cd mysql-test ; \
-	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
+	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
 
 test:	test-unit test-ns test-pr
 

include/mysql.h

@@ -65,9 +65,9 @@ typedef int my_socket;
 #endif /* my_socket_defined */
 #endif /* _global_h */
 
+#include "mysql_version.h"
 #include "mysql_com.h"
 #include "mysql_time.h"
-#include "mysql_version.h"
 #include "typelib.h"
 
 #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */

include/mysql_h.ic

@@ -576,6 +576,7 @@ enum mysql_enum_shutdown_level
     SHUTDOWN_WAIT_UPDATES = (unsigned char)((1 << 3)),
     SHUTDOWN_WAIT_ALL_BUFFERS = ((unsigned char)((1 << 3)) << 1),
     SHUTDOWN_WAIT_CRITICAL_BUFFERS = (((unsigned char)((1 << 3)) << 1) + 1),
+    KILL_QUERY = 254,
     KILL_CONNECTION = 255,
   };
 # 154 "mysql.h"