Merge mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/b17400-mysql-5.1-new

28 files changed, 43 insertions, 31 deletions

diff --git a/win/cmakefiles/client b/client/cmakelists.txt
index 5da9189b0ae..5da9189b0ae 100644
--- a/win/cmakefiles/client
+++ b/client/cmakelists.txt
diff --git a/win/cmakefiles/base b/cmakelists.txt
index ab5317ef171..ab5317ef171 100644
--- a/win/cmakefiles/base
+++ b/cmakelists.txt
diff --git a/win/cmakefiles/dbug b/dbug/cmakelists.txt
index fe20fdd3db6..fe20fdd3db6 100644
--- a/win/cmakefiles/dbug
+++ b/dbug/cmakelists.txt
diff --git a/win/cmakefiles/extra b/extra/cmakelists.txt
index d31779fca63..d31779fca63 100644
--- a/win/cmakefiles/extra
+++ b/extra/cmakelists.txt
diff --git a/win/cmakefiles/yassl b/extra/yassl/cmakelists.txt
index cafa3011e94..cafa3011e94 100644
--- a/win/cmakefiles/yassl
+++ b/extra/yassl/cmakelists.txt
diff --git a/win/cmakefiles/taocrypt b/extra/yassl/taocrypt/cmakelists.txt
index 6f4d0395ff6..6f4d0395ff6 100644
--- a/win/cmakefiles/taocrypt
+++ b/extra/yassl/taocrypt/cmakelists.txt
diff --git a/win/cmakefiles/libmysql b/libmysql/cmakelists.txt
index cb3453fc222..cb3453fc222 100644
--- a/win/cmakefiles/libmysql
+++ b/libmysql/cmakelists.txt
diff --git a/mysql-test/r/events.result b/mysql-test/r/events.result
index ecaf1ec252e..ced21440686 100644
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events.result
@@ -465,4 +465,10 @@ select event_schema, event_name, definer, event_body from information_schema.eve
 event_schema	event_name	definer	event_body
 events_test	white_space	root@localhost	select 3
 drop event white_space;
+create event e1 on schedule every 1 year do set @a = 5;
+create table t1 (s1 int);
+create trigger t1_ai after insert on t1 for each row show create event e1;
+ERROR 0A000: Not allowed to return a result set from a trigger
+drop table t1;
+drop event e1;
 drop database events_test;
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 5ab8779782a..40fe0b09814 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -1166,3 +1166,10 @@ drop procedure bug15091;
 drop function if exists bug16896;
 create aggregate function bug16896() returns int return 1;
 ERROR 42000: AGGREGATE is not supported for stored functions
+drop function if exists bug16164;
+create function bug16164() returns int
+begin
+show authors;
+return 42;
+end|
+ERROR 0A000: Not allowed to return a result set from a function
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index a261b3c0c11..d9d8d75ff8c 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -427,6 +427,16 @@ drop event white_space;
 # END:  BUG #17453: Creating Event crash the server
 #
 
+#
+# Bug#17403 "Events: packets out of order with show create event"
+#
+create event e1 on schedule every 1 year do set @a = 5;
+create table t1 (s1 int);
+--error ER_SP_NO_RETSET
+create trigger t1_ai after insert on t1 for each row show create event e1;
+drop table t1;
+drop event e1;
+
 ##set global event_scheduler=1;
 ##select get_lock("test_lock3", 20);
 ##create event закачка on schedule every 10 hour do select get_lock("test_lock3", 20);
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 4b307de2ad0..da40cdf643a 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -1691,6 +1691,24 @@ drop function if exists bug16896;
 --error ER_SP_NO_AGGREGATE
 create aggregate function bug16896() returns int return 1;
 
+#
+# End of 5.0 tests
+#
+
+#
+# Bug#16164 "Easter egg": check that SHOW AUTHORS is disabled in
+# stored functions/triggers
+#
+--disable_warnings
+drop function if exists bug16164;
+--enable_warnings
+delimiter |;
+--error ER_SP_NO_RETSET
+create function bug16164() returns int
+begin
+  show authors;
+  return 42;
+end|
 
 #
 # BUG#NNNN: New bug synopsis
diff --git a/win/cmakefiles/mysys b/mysys/cmakelists.txt
index ceecc1368ec..ceecc1368ec 100644
--- a/win/cmakefiles/mysys
+++ b/mysys/cmakelists.txt
diff --git a/win/cmakefiles/regex b/regex/cmakelists.txt
index e00f339b3b9..e00f339b3b9 100644
--- a/win/cmakefiles/regex
+++ b/regex/cmakelists.txt
diff --git a/win/cmakefiles/im b/server-tools/instance-manager/cmakelists.txt
index 32f243b43d9..32f243b43d9 100644
--- a/win/cmakefiles/im
+++ b/server-tools/instance-manager/cmakelists.txt
diff --git a/win/cmakefiles/sql b/sql/cmakelists.txt
index 2099ef94996..2099ef94996 100644
--- a/win/cmakefiles/sql
+++ b/sql/cmakelists.txt
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index d97dcc390ca..ea2f67b3ba5 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -176,6 +176,7 @@ sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SHOW_CREATE_DB:
   case SQLCOM_SHOW_CREATE_FUNC:
   case SQLCOM_SHOW_CREATE_PROC:
+  case SQLCOM_SHOW_CREATE_EVENT:
   case SQLCOM_SHOW_DATABASES:
   case SQLCOM_SHOW_ERRORS:
   case SQLCOM_SHOW_FIELDS:
@@ -200,6 +201,7 @@ sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SHOW_WARNS:
   case SQLCOM_SHOW_PROC_CODE:
   case SQLCOM_SHOW_FUNC_CODE:
+  case SQLCOM_SHOW_AUTHORS:
   case SQLCOM_REPAIR:
   case SQLCOM_BACKUP_TABLE:
   case SQLCOM_RESTORE_TABLE:
diff --git a/win/cmakefiles/bdb b/storage/bdb/cmakelists.txt
index 8651930657f..8651930657f 100644
--- a/win/cmakefiles/bdb
+++ b/storage/bdb/cmakelists.txt
diff --git a/win/cmakefiles/heap b/storage/heap/cmakelists.txt
index db5fb8b2981..db5fb8b2981 100644
--- a/win/cmakefiles/heap
+++ b/storage/heap/cmakelists.txt
diff --git a/win/cmakefiles/innobase b/storage/innobase/cmakelists.txt
index 2c5eeba705e..2c5eeba705e 100644
--- a/win/cmakefiles/innobase
+++ b/storage/innobase/cmakelists.txt
diff --git a/win/cmakefiles/myisam b/storage/myisam/cmakelists.txt
index 3ba7aba4555..3ba7aba4555 100644
--- a/win/cmakefiles/myisam
+++ b/storage/myisam/cmakelists.txt
diff --git a/win/cmakefiles/myisammrg b/storage/myisammrg/cmakelists.txt
index 83168f6c60c..83168f6c60c 100644
--- a/win/cmakefiles/myisammrg
+++ b/storage/myisammrg/cmakelists.txt
diff --git a/win/cmakefiles/strings b/strings/cmakelists.txt
index 7b78e5f6b39..7b78e5f6b39 100644
--- a/win/cmakefiles/strings
+++ b/strings/cmakelists.txt
diff --git a/win/cmakefiles/tests b/tests/cmakelists.txt
index 1b627329028..1b627329028 100644
--- a/win/cmakefiles/tests
+++ b/tests/cmakelists.txt
diff --git a/win/cmakefiles/vio b/vio/cmakelists.txt
index a3cbb304289..a3cbb304289 100644
--- a/win/cmakefiles/vio
+++ b/vio/cmakelists.txt
diff --git a/win/build-vs71.bat b/win/build-vs71.bat
index db92d9c3b72..46f3bc32f6e 100644
--- a/win/build-vs71.bat
+++ b/win/build-vs71.bat
@@ -1,10 +1,5 @@
 @echo off
 
-REM - First we need to copy all the cmakelists to the proper folders
-cd win\cmakefiles
-call deploy.bat
-cd ..\..
-
 del cmakecache.txt
 copy win\vs71cache.txt cmakecache.txt
 cmake -G "Visual Studio 7 .NET 2003"
diff --git a/win/build-vs8.bat b/win/build-vs8.bat
index 54789b16503..349c3e78628 100644
--- a/win/build-vs8.bat
+++ b/win/build-vs8.bat
@@ -1,10 +1,5 @@
 @echo off
 
-REM - First we need to copy all the cmakelists to the proper folders
-cd win\cmakefiles
-call deploy.bat
-cd ..\..
-
 del cmakecache.txt
 copy win\vs8cache.txt cmakecache.txt
 cmake -G "Visual Studio 8 2005"
diff --git a/win/cmakefiles/deploy.bat b/win/cmakefiles/deploy.bat
deleted file mode 100644
index 44ecb2d55fb..00000000000
--- a/win/cmakefiles/deploy.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-copy base ..\..\cmakelists.txt
-copy client ..\..\client\cmakelists.txt
-copy dbug ..\..\dbug\cmakelists.txt
-copy extra ..\..\extra\cmakelists.txt
-copy mysys ..\..\mysys\cmakelists.txt
-copy regex ..\..\regex\cmakelists.txt
-copy sql ..\..\sql\cmakelists.txt
-copy strings ..\..\strings\cmakelists.txt
-copy vio ..\..\vio\cmakelists.txt
-copy zlib ..\..\zlib\cmakelists.txt
-copy yassl ..\..\extra\yassl\cmakelists.txt
-copy taocrypt ..\..\extra\yassl\taocrypt\cmakelists.txt
-copy bdb ..\..\storage\bdb\cmakelists.txt
-copy heap ..\..\storage\heap\cmakelists.txt
-copy innobase ..\..\storage\innobase\cmakelists.txt
-copy myisam ..\..\storage\myisam\cmakelists.txt
-copy myisammrg ..\..\storage\myisammrg\cmakelists.txt
-copy im ..\..\server-tools\instance-manager\cmakelists.txt
-copy libmysql ..\..\libmysql\cmakelists.txt
-copy tests ..\..\tests\cmakelists.txt
diff --git a/win/cmakefiles/zlib b/zlib/cmakelists.txt
index 53560adf6d1..53560adf6d1 100644
--- a/win/cmakefiles/zlib
+++ b/zlib/cmakelists.txt