MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:February 25 2010 7:45pm
Subject:bzr push into mysql-next-mr branch (alik:2975 to 2989)
View as plain text  
 2989 Alexander Nozdrin	2010-02-25 [merge]
      Fix default.conf.

    modified:
      .bzr-mysql/default.conf
 2988 Vladislav Vaintroub	2010-02-25
      Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit Solaris.
      Crash happens in dlopen() code when trying to load the library. Crash does not happen when library is 
      not DTrace instrumented . Additionally, crash does not happen with default Solaris 10 GCC 3.4.3 and
      it does not happen if main executable is instrumented.
      
      So , just check for this specific situation (32 bit, GCC3.4.6 , Solaris) and disable Dtrace in shared libraries.
      We have only single plugin so far that is instrumented (ha_example)

    modified:
      cmake/dtrace.cmake
 2987 Vladislav Vaintroub	2010-02-25
      On Solaris,  overwrite CMake's proposed thread library -lthread with -lpthread. 
      -lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. 
      Note : the workaround existed prior and did not work  since CMAKE_THREADS_LIBS_INIT was already
       in cache.  Now, use SET(.. CACHE FORCE)  to overwrite the cached value.

    modified:
      cmake/os/SunOS.cmake
 2986 Vladislav Vaintroub	2010-02-24 [merge]
      merge

    modified:
      CMakeLists.txt
      cmake/build_configurations/mysql_release.cmake
      cmake/install_layout.cmake
      mysql-test/CMakeLists.txt
      mysql-test/r/perror-win.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/t/perror.test
      sql/CMakeLists.txt
      sql/share/CMakeLists.txt
 2985 Vladislav Vaintroub	2010-02-24
      #51466 : Source packages are broken with cmake in a cmake-agnostic environment
      
      In the worst case possible scenario (no bzr, in-source build),
      make dist produced a package that compiled ok with autotools
      but failed to package because extra make_binary_distribution was
      found in source package and was not built. make_binary_distribution
      contained paths of the build machine.
      
      Fix:  exclude some scripts that are produced in cmake build. 
      Note that there is no good general fix for it in this specific scenario.
      it is advisable to build source packages out of source or in bzr repo.

    added:
      cmake/cpack_source_ignore_files.cmake
    modified:
      cmake/Makefile.am
      cmake/mysql_version.cmake
 2984 Vladislav Vaintroub	2010-02-24
      Fix --with-ssl mappping (--with-ssl=dir should be "yes" or 
      actually "system"), --with-ssl should be "bundled".
      
      Fixes error on sol-gcc-x86, where build machine had  openssl but not
      the test box.

    modified:
      cmake/configure.pl
 2983 Vladislav Vaintroub	2010-02-24 [merge]
      merge

    modified:
      client/mysqltest.cc
      extra/comp_err.c
      extra/perror.c
      mysql-test/r/perror.result
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/t/perror.test
 2982 Vladislav Vaintroub	2010-02-24
      Fix typo 
      HAVE_IBGCC_ATOMIC_BUILTINS=>HAVE_IB_GCC_ATOMIC_BUILTINS.
      Due to the typo, detection of atomics was broken. 
      It also lead to valgrind error during shutdown 
      (access to freed memory),which is likely present 
      in all builds where atomics are not used.

    modified:
      storage/innobase/CMakeLists.txt
 2981 Vladislav Vaintroub	2010-02-23 [merge]
      merge

    modified:
      include/atomic/x86-gcc.h
      include/my_atomic.h
      mysql-test/r/errors.result
      mysql-test/r/grant.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/signal.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/sp_notembedded.result
      mysql-test/r/strict.result
      mysql-test/r/udf.result
      mysql-test/r/view.result
      mysql-test/r/warnings.result
      mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
      mysql-test/t/innodb_mysql.test
      mysql-test/t/udf.test
      mysql-test/t/view.test
      sql/sql_base.cc
      sql/sql_parse.cc
 2980 Vladislav Vaintroub	2010-02-23
      Bug#43201: Post-fix.  Set thread stack address at the start of each query.
      
      Reason: implementation of send/reap in mysqltest uses the same "embedded" connection in a thread different from current, so thread stack has to change when connection is used in different  OS thread..

    modified:
      libmysqld/lib_sql.cc
 2979 Vladislav Vaintroub	2010-02-23 [merge]
      merge

    modified:
      mysql-test/include/mtr_warnings.sql
 2978 Vladislav Vaintroub	2010-02-23
      remove whitespace at the end of line in Makefile.am, to keep BUILD/autorun.sh silent

    modified:
      cmake/Makefile.am
 2977 Vladislav Vaintroub	2010-02-23 [merge]
      merge, CMake bugfixes, remove sp-error from experimental

    modified:
      BUILD/choose_configure.sh
      cmake/configure.pl
      mysql-test/collections/default.experimental
      mysql-test/lib/v1/mysql-test-run.pl
      mysys/CMakeLists.txt
      scripts/CMakeLists.txt
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/mysql_priv.h
      sql/opt_range.cc
      sql/sql_parse.cc
      sql/sql_select.cc
 2976 Jonathan Perkin	2010-02-23 [merge]
      Merge to mysql-next-mr-bugfixing

    modified:
      CMakeLists.txt
 2975 Alexander Nozdrin	2010-02-22 [merge]
      Manual merge from mysql-next-mr.
      Conflicts:
        - mysql-test/r/mysqld--help-notwin.result
        - mysql-test/r/mysqld--help-win.result

    removed:
      storage/mysql_storage_engine.cmake
      unittest/mysys/CMakeLists.txt
      unittest/mytap/CMakeLists.txt
    added:
      BUILD-CMAKE
      BUILD/choose_configure.sh
      cmake/
      cmake/Makefile.am
      cmake/abi_check.cmake
      cmake/bison.cmake
      cmake/build_configurations/
      cmake/build_configurations/mysql_release.cmake
      cmake/cat.cmake
      cmake/character_sets.cmake
      cmake/check_minimal_version.cmake
      cmake/cmake_parse_arguments.cmake
      cmake/configurable_file_content.in
      cmake/configure.pl
      cmake/create_initial_db.cmake.in
      cmake/do_abi_check.cmake
      cmake/dtrace.cmake
      cmake/dtrace_prelink.cmake
      cmake/install_layout.cmake
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/make_dist.cmake.in
      cmake/merge_archives_unix.cmake.in
      cmake/mysql_add_executable.cmake
      cmake/mysql_version.cmake
      cmake/os/
      cmake/os/AIX.cmake
      cmake/os/Cygwin.cmake
      cmake/os/Darwin.cmake
      cmake/os/FreeBSD.cmake
      cmake/os/HP-UX.cmake
      cmake/os/Linux.cmake
      cmake/os/OS400.cmake
      cmake/os/SunOS.cmake
      cmake/os/Windows.cmake
      cmake/os/WindowsCache.cmake
      cmake/package_name.cmake
      cmake/plugin.cmake
      cmake/readline.cmake
      cmake/ssl.cmake
      cmake/stack_direction.c
      cmake/versioninfo.rc.in
      cmake/zlib.cmake
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/readline/CMakeLists.txt
      config.h.cmake
      configure.cmake
      include/CMakeLists.txt
      man/CMakeLists.txt
      mysql-test/CMakeLists.txt
      mysql-test/collections/test-bt
      mysql-test/collections/test-bt-debug
      mysql-test/collections/test-bt-debug-fast
      mysql-test/collections/test-bt-fast
      mysql-test/mtr.out-of-source
      plugin/audit_null/CMakeLists.txt
      plugin/daemon_example/CMakeLists.txt
      plugin/fulltext/CMakeLists.txt
      sql-bench/CMakeLists.txt
      sql/main.cc
      sql/share/CMakeLists.txt
      support-files/CMakeLists.txt
      unittest/mysys/CMakeLists.txt
      unittest/mytap/CMakeLists.txt
    modified:
      BUILD/Makefile.am
      BUILD/autorun.sh
      CMakeLists.txt
      Makefile.am
      client/CMakeLists.txt
      client/mysqltest.cc
      cmd-line-utils/libedit/Makefile.am
      cmd-line-utils/readline/Makefile.am
      configure.in
      dbug/CMakeLists.txt
      extra/CMakeLists.txt
      extra/yassl/CMakeLists.txt
      extra/yassl/taocrypt/CMakeLists.txt
      include/Makefile.am
      include/keycache.h
      include/my_atomic.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/mysql/plugin.h
      include/thr_alarm.h
      libmysql/CMakeLists.txt
      libmysql/libmysql.def
      libmysqld/CMakeLists.txt
      libmysqld/examples/CMakeLists.txt
      libmysqld/lib_sql.cc
      man/Makefile.am
      mysql-test/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/include/mysqld--help.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/Find.pm
      mysql-test/lib/My/SafeProcess.pm
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/parts/r/partition_recover_myisam.result
      mysql-test/suite/parts/t/partition_recover_myisam.test
      mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
      mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
      mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
      mysql-test/suite/sys_vars/t/shared_memory_basic.test
      mysql-test/t/fulltext_plugin.test
      mysql-test/t/loadxml.test
      mysys/CMakeLists.txt
      mysys/my_create.c
      mysys/my_getsystime.c
      mysys/my_handler.c
      mysys/my_rdtsc.c
      mysys/my_winthread.c
      mysys/mysys_priv.h
      mysys/typelib.c
      plugin/audit_null/Makefile.am
      plugin/daemon_example/Makefile.am
      plugin/fulltext/Makefile.am
      plugin/semisync/CMakeLists.txt
      regex/CMakeLists.txt
      regex/regex2.h
      scripts/CMakeLists.txt
      scripts/Makefile.am
      scripts/mysqld_safe.sh
      sql-bench/Makefile.am
      sql/CMakeLists.txt*
      sql/Makefile.am
      sql/handler.cc
      sql/log.cc
      sql/mysqld.cc
      sql/nt_servc.cc
      sql/share/Makefile.am
      sql/sql_builtin.cc.in
      sql/sql_class.h
      storage/Makefile.am
      storage/archive/CMakeLists.txt
      storage/blackhole/CMakeLists.txt
      storage/csv/CMakeLists.txt
      storage/example/CMakeLists.txt
      storage/federated/CMakeLists.txt
      storage/heap/CMakeLists.txt
      storage/ibmdb2i/CMakeLists.txt
      storage/innobase/CMakeLists.txt
      storage/myisam/CMakeLists.txt
      storage/myisammrg/CMakeLists.txt
      storage/perfschema/CMakeLists.txt
      storage/perfschema/unittest/CMakeLists.txt
      strings/CMakeLists.txt
      support-files/Makefile.am
      tests/CMakeLists.txt
      unittest/mytap/tap.c
      vio/CMakeLists.txt
      win/configure.js
      win/create_def_file.js
      zlib/CMakeLists.txt
=== modified file 'BUILD/choose_configure.sh'
--- a/BUILD/choose_configure.sh	2009-11-09 11:32:48 +0000
+++ b/BUILD/choose_configure.sh	2010-02-23 11:32:57 +0000
@@ -7,8 +7,8 @@ cmake -P cmake/check_minimal_version.cma
 perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
 if test "$HAVE_CMAKE" = "no"
 then
-  sh ./configure.am $@
+  sh ./configure.am "$@"
 else
-  perl ./cmake/configure.pl $@
+  perl ./cmake/configure.pl "$@"
 fi
 

=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2010-02-19 16:51:53 +0000
+++ b/CMakeLists.txt	2010-02-24 19:19:24 +0000
@@ -268,7 +268,8 @@ ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 INCLUDE(CPack)
-INSTALL(FILES COPYING EXCEPTIONS-CLIENT README DESTINATION ${INSTALL_DOCREADMEDIR})
+INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} OPTIONAL)
+INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR})
 IF(UNIX)
   INSTALL(FILES Docs/INSTALL-BINARY DESTINATION 
   ${INSTALL_DOCREADMEDIR})
@@ -277,9 +278,10 @@ ENDIF()
 SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
 MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
 INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
+  PATTERN "INSTALL-BINARY" EXCLUDE
   PATTERN "Makefile.*" EXCLUDE
   PATTERN "myisam.txt" EXCLUDE
   PATTERN "glibc*" EXCLUDE
   PATTERN "sp-imp-spec.txt" EXCLUDE
   PATTERN "linuxthreads.txt" EXCLUDE
-)
\ No newline at end of file
+)

=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2010-01-30 22:10:29 +0000
+++ b/client/client_priv.h	2010-02-17 12:15:07 +0000
@@ -34,7 +34,7 @@
 enum options_client
 {
   OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
-  OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
+  OPT_PAGER, OPT_TEE,
   OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
   OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,
   OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,
@@ -48,8 +48,8 @@ enum options_client
   OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION,OPT_MYSQL_PROTOCOL,
   OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
   OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,
-  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS, OPT_SERVER_ARG,
-  OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
+  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG,
+  OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
   OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
 #ifdef HAVE_NDBCLUSTER_DB
   OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2010-02-06 10:28:06 +0000
+++ b/client/mysql.cc	2010-02-20 09:40:21 +0000
@@ -1373,7 +1373,7 @@ static struct my_option my_long_options[
    (uchar**) &opt_rehash, (uchar**) &opt_rehash, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0,
    0, 0},
   {"no-auto-rehash", 'A',
-   "No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of mysql and disables rehashing on reconnect. WARNING: options deprecated; use --disable-auto-rehash instead.",
+   "No automatic rehashing. One has to use 'rehash' to get table and field completion. This gives a quicker start of mysql and disables rehashing on reconnect.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"auto-vertical-output", OPT_AUTO_VERTICAL_OUTPUT,
     "Automatically switch to vertical output mode if the result is wider than the terminal width.",
@@ -1425,9 +1425,6 @@ static struct my_option my_long_options[
    "Enable named commands. Named commands mean this program's internal commands; see mysql> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default.",
    (uchar**) &named_cmds, (uchar**) &named_cmds, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
    0, 0},
-  {"no-named-commands", 'g',
-   "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"ignore-spaces", 'i', "Ignore space after function names.",
    (uchar**) &ignore_spaces, (uchar**) &ignore_spaces, 0, GET_BOOL, NO_ARG, 0, 0,
    0, 0, 0, 0},
@@ -1449,7 +1446,7 @@ static struct my_option my_long_options[
   {"line-numbers", OPT_LINE_NUMBERS, "Write line numbers for errors.",
    (uchar**) &line_numbers, (uchar**) &line_numbers, 0, GET_BOOL,
    NO_ARG, 1, 0, 0, 0, 0, 0},  
-  {"skip-line-numbers", 'L', "Don't write line number for errors. WARNING: -L is deprecated, use long version of this option instead.", 0, 0, 0, GET_NO_ARG,
+  {"skip-line-numbers", 'L', "Don't write line number for errors.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"unbuffered", 'n', "Flush buffer after each query.", (uchar**) &unbuffered,
    (uchar**) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -1457,11 +1454,8 @@ static struct my_option my_long_options[
    (uchar**) &column_names, (uchar**) &column_names, 0, GET_BOOL,
    NO_ARG, 1, 0, 0, 0, 0, 0},
   {"skip-column-names", 'N',
-   "Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead.",
+   "Don't write column names in results.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"set-variable", 'O',
-   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"sigint-ignore", OPT_SIGINT_IGNORE, "Ignore SIGINT (CTRL-C)",
    (uchar**) &opt_sigint_ignore,  (uchar**) &opt_sigint_ignore, 0, GET_BOOL,
    NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -1472,9 +1466,6 @@ static struct my_option my_long_options[
   {"pager", OPT_PAGER,
    "Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-pager", OPT_NOPAGER,
-   "Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option deprecated; use --disable-pager instead.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"password", 'p',
    "Password to use when connecting to server. If password is not given it's asked from the tty.",
@@ -1520,8 +1511,6 @@ static struct my_option my_long_options[
   {"tee", OPT_TEE,
    "Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\h) also. WARNING: option deprecated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", (uchar**) &current_user,
    (uchar**) &current_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1660,11 +1649,6 @@ get_one_option(int optid, const struct m
     else
       init_tee(argument);
     break;
-  case OPT_NOTEE:
-    printf("WARNING: option deprecated; use --disable-tee instead.\n");
-    if (opt_outfile)
-      end_tee();
-    break;
   case OPT_PAGER:
     if (argument == disabled_my_option)
       opt_nopager= 1;
@@ -1683,10 +1667,6 @@ get_one_option(int optid, const struct m
 	opt_nopager= 1;
     }
     break;
-  case OPT_NOPAGER:
-    printf("WARNING: option deprecated; use --disable-pager instead.\n");
-    opt_nopager= 1;
-    break;
   case OPT_MYSQL_PROTOCOL:
 #ifndef EMBEDDED_LIBRARY
     opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,

=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2010-02-06 10:28:06 +0000
+++ b/client/mysqlbinlog.cc	2010-02-20 09:40:21 +0000
@@ -1077,11 +1077,6 @@ static struct my_option my_long_options[
    "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ").",
    (uchar**) &port, (uchar**) &port, 0, GET_INT, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-  {"position", 'j', "Deprecated. Use --start-position instead.",
-   (uchar**) &start_position, (uchar**) &start_position, 0, GET_ULL,
-   REQUIRED_ARG, BIN_LOG_HEADER_SIZE, BIN_LOG_HEADER_SIZE,
-   /* COM_BINLOG_DUMP accepts only 4 bytes for the position */
-   (ulonglong)(~(uint32)0), 0, 0, 0},
   {"protocol", OPT_MYSQL_PROTOCOL,
    "The protocol of connection (tcp,socket,pipe,memory).",
    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1120,7 +1115,7 @@ static struct my_option my_long_options[
    "(you should probably use quotes for your shell to set it properly).",
    (uchar**) &start_datetime_str, (uchar**) &start_datetime_str,
    0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"start-position", OPT_START_POSITION,
+  {"start-position", 'j',
    "Start reading the binlog at position N. Applies to the first binlog "
    "passed on the command line.",
    (uchar**) &start_position, (uchar**) &start_position, 0, GET_ULL,

=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2010-02-06 10:28:06 +0000
+++ b/client/mysqldump.c	2010-02-20 09:40:21 +0000
@@ -184,9 +184,6 @@ HASH ignore_table;
 
 static struct my_option my_long_options[] =
 {
-  {"all", 'a', "Deprecated. Use --create-options instead.",
-   (uchar**) &create_options, (uchar**) &create_options, 0, GET_BOOL, NO_ARG, 1,
-   0, 0, 0, 0, 0},
   {"all-databases", 'A',
    "Dump all the databases. This will be same as --databases with all databases selected.",
    (uchar**) &opt_alldbs, (uchar**) &opt_alldbs, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
@@ -239,7 +236,7 @@ static struct my_option my_long_options[
   {"compress", 'C', "Use compression in server/client protocol.",
    (uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
-  {"create-options", OPT_CREATE_OPTIONS,
+  {"create-options", 'a',
    "Include all MySQL specific create options.",
    (uchar**) &create_options, (uchar**) &create_options, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
@@ -304,9 +301,6 @@ static struct my_option my_long_options[
    (uchar**) &opt_enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0 ,0, 0},
   {"fields-escaped-by", OPT_ESC, "Fields in the i.file are escaped by ...",
    (uchar**) &escaped, (uchar**) &escaped, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"first-slave", 'x', "Deprecated, renamed to --lock-all-tables.",
-   (uchar**) &opt_lock_all_tables, (uchar**) &opt_lock_all_tables, 0, GET_BOOL, NO_ARG,
-   0, 0, 0, 0, 0, 0},
   {"flush-logs", 'F', "Flush logs file in server before starting dump. "
    "Note that if you dump many databases at once (using the option "
    "--databases= or --all-databases), the logs will be flushed for "
@@ -394,8 +388,7 @@ static struct my_option my_long_options[
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"no-data", 'd', "No row information.", (uchar**) &opt_no_data,
    (uchar**) &opt_no_data, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-set-names", 'N',
-   "Deprecated. Use --skip-set-charset instead.",
+  {"no-set-names", 'N',  "Same as--skip-set-charset.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"opt", OPT_OPTIMIZE,
    "Same as --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys. Enabled by default, disable with --skip-opt.",
@@ -433,9 +426,6 @@ static struct my_option my_long_options[
    "Add 'SET NAMES default_character_set' to the output.",
    (uchar**) &opt_set_charset, (uchar**) &opt_set_charset, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
-  {"set-variable", 'O',
-   "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-02-20 10:23:12 +0000
+++ b/client/mysqltest.cc	2010-02-24 00:45:49 +0000
@@ -4460,12 +4460,13 @@ typedef struct
 {
   const char *name;
   uint        code;
+  const char *text;
 } st_error;
 
 static st_error global_error_names[] =
 {
 #include <mysqld_ername.h>
-  { 0, 0 }
+  { 0, 0, 0 }
 };
 
 uint get_errcode_from_name(char *error_name, char *error_end)

=== modified file 'cmake/Makefile.am'
--- a/cmake/Makefile.am	2010-01-29 02:07:00 +0000
+++ b/cmake/Makefile.am	2010-02-24 19:07:05 +0000
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	cmake_parse_arguments.cmake \
+	cpack_source_ignore_files.cmake \
 	package_name.cmake \
 	configurable_file_content.in \
 	check_minimal_version.cmake \
@@ -25,7 +26,7 @@ EXTRA_DIST = \
 	mysql_add_executable.cmake  \
 	install_layout.cmake \
 	build_configurations/mysql_release.cmake \
-	os/Windows.cmake \ 
+	os/Windows.cmake \
 	os/WindowsCache.cmake \
 	os/Linux.cmake \
 	os/SunOS.cmake \

=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-02-02 20:32:38 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-02-24 19:19:24 +0000
@@ -80,6 +80,8 @@ IF(FEATURE_SET)
   ENDFOREACH()
 ENDIF()
 
+SET(WITHOUT_AUDIT_NULL ON CACHE BOOL "")
+SET(WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL "")
 
 OPTION(ENABLE_LOCAL_INFILE "" ON)
 SET(WITH_SSL bundled CACHE STRING "")

=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl	2010-02-20 13:17:55 +0000
+++ b/cmake/configure.pl	2010-02-24 18:51:45 +0000
@@ -38,12 +38,55 @@ sub set_installdir 
    }
 }
 
+# CMake understands CC and CXX env.variables correctly, if they  contain 1 or 2 tokens
+# e.g CXX=gcc and CXX="ccache gcc" are ok. However it could have a problem if there
+# (recognizing gcc) with more tokens ,e.g CXX="ccache gcc --pipe".
+# The problem is simply fixed by splitting compiler and flags, e.g
+# CXX="ccache gcc --pipe" => CXX=ccache gcc CXXFLAGS=--pipe
+
+sub check_compiler
+{
+  my ($varname, $flagsvarname) = @_;
+  my @tokens = split(/ /,$ENV{$varname});
+  if($#tokens >= 2)  
+  {
+    $ENV{$varname} = $tokens[0]." ".$tokens[1];
+    my $flags;
+
+    for(my $i=2; $i<=$#tokens; $i++)
+    {
+      $flags= $flags." ".$tokens[$i];  
+    }
+    if(defined $ENV{$flagsvarname})
+    {
+      $flags = $flags." ".$ENV{$flagsvarname};
+    }
+    $ENV{$flagsvarname}=$flags;
+    print("$varname=$ENV{$varname}\n");
+    print("$flagsvarname=$ENV{$flagsvarname}\n");
+  }  
+}
+
+check_compiler("CC", "CFLAGS");
+check_compiler("CXX", "CXXFLAGS");
+
 foreach my $option (@ARGV)
 {
-  if (substr ($option, 0, 2) == "--")
+  if (substr ($option, 0, 2) eq "--")
   {
     $option = substr($option, 2);
   }
+  else
+  {
+    # This must be environment variable
+    my @v  = split('=', $option);
+    my $name = shift(@v);
+    if(@v)
+    {
+      $ENV{$name} = join('=', @v);  
+    }	
+    next;
+  }
   if($option =~ /srcdir/)
   {
     $srcdir = substr($option,7);
@@ -87,12 +130,12 @@ foreach my $option (@ARGV)
   }
   if($option =~ /with-ssl=/)
   {
-    $cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
+    $cmakeargs = $cmakeargs." -DWITH_SSL=yes";
     next;
   }
   if($option =~ /with-ssl/)
   {
-    $cmakeargs = $cmakeargs." -DWITH_SSL=yes";
+    $cmakeargs = $cmakeargs." -DWITH_SSL=bundled";
     next;
   }
   if($option =~ /prefix=/)

=== added file 'cmake/cpack_source_ignore_files.cmake'
--- a/cmake/cpack_source_ignore_files.cmake	1970-01-01 00:00:00 +0000
+++ b/cmake/cpack_source_ignore_files.cmake	2010-02-24 19:07:05 +0000
@@ -0,0 +1,40 @@
+SET(CPACK_SOURCE_IGNORE_FILES
+\\\\.bzr/
+\\\\.bzr-mysql
+\\\\.bzrignore
+CMakeCache\\\\.txt
+cmake_dist\\\\.cmake
+CPackSourceConfig\\\\.cmake
+CPackConfig.cmake
+/cmake_install\\\\.cmake
+/CTestTestfile\\\\.cmake
+/CMakeFiles/
+/version_resources/
+/_CPack_Packages/
+$\\\\.gz
+$\\\\.zip
+/CMakeFiles/
+/version_resources/
+/_CPack_Packages/
+scripts/make_binary_distribution$
+scripts/msql2mysql$
+scripts/mysql_config$
+scripts/mysql_convert_table_format$
+scripts/mysql_find_rows$
+scripts/mysql_fix_extensions$
+scripts/mysql_install_db$
+scripts/mysql_secure_installation$
+scripts/mysql_setpermission$
+scripts/mysql_zap$
+scripts/mysqlaccess$
+scripts/mysqld_multi$
+scripts/mysqld_safe$
+scripts/mysqldumpslow$
+scripts/mysqlhotcopy$
+Makefile$
+include/config\\\\.h$
+include/my_config\\\\.h$
+/autom4te\\\\.cache/
+errmsg\\\\.sys$
+#
+)

=== modified file 'cmake/dtrace.cmake'
--- a/cmake/dtrace.cmake	2009-12-24 06:21:05 +0000
+++ b/cmake/dtrace.cmake	2010-02-25 16:31:31 +0000
@@ -72,8 +72,29 @@ IF(ENABLE_DTRACE)
   ) 
 ENDIF()
 
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
+  AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+  IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
+    EXECUTE_PROCESS(
+      COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}  --version
+      OUTPUT_VARIABLE out)
+    IF(out MATCHES "3.4.6")
+     # This gcc causes crashes in dlopen() for dtraced shared libs,
+     # while standard shipped with Solaris10 3.4.3 is ok
+     SET(BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL "")
+    ELSE()
+     SET(BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL "")
+    ENDIF()
+  ENDIF()
+ENDIF()
 
-MACRO(DTRACE_INSTRUMENT target)
+FUNCTION(DTRACE_INSTRUMENT target)
+  IF(BUGGY_GCC_NO_DTRACE_MODULES)
+    GET_TARGET_PROPERTY(target_type ${target} TYPE)
+    IF(target_type MATCHES "MODULE_LIBRARY")
+      RETURN()
+    ENDIF()
+  ENDIF()
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
@@ -119,7 +140,7 @@ MACRO(DTRACE_INSTRUMENT target)
       ENDIF()
     ENDIF()
   ENDIF()
-ENDMACRO()
+ENDFUNCTION()
 
 
 # Ugly workaround for Solaris' DTrace inability to use probes

=== modified file 'cmake/install_layout.cmake'
--- a/cmake/install_layout.cmake	2010-01-25 12:12:29 +0000
+++ b/cmake/install_layout.cmake	2010-02-24 19:19:24 +0000
@@ -80,7 +80,7 @@ ENDIF()
  SET(INSTALL_LIBDIR_STANDALONE "lib")
  SET(INSTALL_INCLUDEDIR_STANDALONE "include")
  SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
- SET(INSTALL_DOCDIR_STANDALONE "doc")
+ SET(INSTALL_DOCDIR_STANDALONE "docs")
  SET(INSTALL_MANDIR_STANDALONE "man")
  SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
  SET(INSTALL_SHAREDIR_STANDALONE "share")

=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2010-02-06 16:13:42 +0000
+++ b/cmake/mysql_version.cmake	2010-02-24 19:07:05 +0000
@@ -108,17 +108,7 @@ IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
 ENDIF()
 SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
 SET(CPACK_SOURCE_GENERATOR "TGZ")
-SET(CPACK_SOURCE_IGNORE_FILES 
-  \\\\.bzr/
-  \\\\.bzr-mysql
-  .bzrignore
-  CMakeCache.txt
-  /CMakeFiles/
-  /version_resources/
-  /_CPack_Packages/
-  $.gz
-  $.zip
-)
+INCLUDE(cpack_source_ignore_files)
 
 # Defintions for windows version resources
 SET(PRODUCTNAME "MySQL Server")

=== modified file 'cmake/os/SunOS.cmake'
--- a/cmake/os/SunOS.cmake	2010-01-27 00:50:19 +0000
+++ b/cmake/os/SunOS.cmake	2010-02-25 09:57:23 +0000
@@ -30,7 +30,7 @@ SET(LIBM m)
 
 # CMake defined -lthread as thread flag. This crashes in dlopen 
 # when trying to load plugins workaround with -lpthread
-SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "")
+SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
 
 # Solaris specific large page support
 CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_DECL_MHA_MAPSIZE_VA)

=== modified file 'configure.in'
--- a/configure.in	2010-02-20 10:23:12 +0000
+++ b/configure.in	2010-02-22 13:22:31 +0000
@@ -839,7 +839,7 @@ 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 \
+ 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 \

=== modified file 'extra/comp_err.c'
--- a/extra/comp_err.c	2009-12-12 20:38:59 +0000
+++ b/extra/comp_err.c	2010-02-24 00:45:49 +0000
@@ -199,11 +199,34 @@ int main(int argc, char *argv[])
 }
 
 
+static void print_escaped_string(FILE *f, const char *str)
+{
+  const char *tmp = str;
+
+  while (tmp[0] != 0)
+  {
+    switch (tmp[0])
+    {
+      case '\\': fprintf(f, "\\\\"); break;
+      case '\'': fprintf(f, "\\\'"); break;
+      case '\"': fprintf(f, "\\\""); break;
+      case '\n': fprintf(f, "\\n"); break;
+      case '\r': fprintf(f, "\\r"); break;
+      default: fprintf(f, "%c", tmp[0]);
+    }
+    tmp++;
+  }
+}
+
+
 static int create_header_files(struct errors *error_head)
 {
   uint er_last;
   FILE *er_definef, *sql_statef, *er_namef;
   struct errors *tmp_error;
+  struct message *er_msg;
+  const char *er_text;
+
   DBUG_ENTER("create_header_files");
   LINT_INIT(er_last);
 
@@ -245,9 +268,12 @@ static int create_header_files(struct er
 	      "{ %-40s,\"%s\", \"%s\" },\n", tmp_error->er_name,
 	      tmp_error->sql_code1, tmp_error->sql_code2);
     /*generating er_name file */
-    fprintf(er_namef, "{ \"%s\", %d },\n", tmp_error->er_name,
-	    tmp_error->d_code);
-
+    er_msg= find_message(tmp_error, default_language, 0);
+    er_text = (er_msg ? er_msg->text : "");
+    fprintf(er_namef, "{ \"%s\", %d, \"", tmp_error->er_name,
+            tmp_error->d_code);
+    print_escaped_string(er_namef, er_text);
+    fprintf(er_namef, "\" },\n");
   }
   /* finishing off with mysqld_error.h */
   fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last);

=== modified file 'extra/perror.c'
--- a/extra/perror.c	2009-07-24 06:45:06 +0000
+++ b/extra/perror.c	2010-02-24 00:45:49 +0000
@@ -184,6 +184,45 @@ static const char *get_ha_error_msg(int 
   return NullS;
 }
 
+typedef struct
+{
+  const char *name;
+  uint        code;
+  const char *text;
+} st_error;
+
+static st_error global_error_names[] =
+{
+#include <mysqld_ername.h>
+  { 0, 0, 0 }
+};
+
+/**
+  Lookup an error by code in the global_error_names array.
+  @param code the code to lookup
+  @param [out] name_ptr the error name, when found
+  @param [out] msg_ptr the error text, when found
+  @return 1 when found, otherwise 0
+*/
+int get_ER_error_msg(uint code, const char **name_ptr, const char **msg_ptr)
+{
+  st_error *tmp_error;
+
+  tmp_error= & global_error_names[0];
+
+  while (tmp_error->name != NULL)
+  {
+    if (tmp_error->code == code)
+    {
+      *name_ptr= tmp_error->name;
+      *msg_ptr= tmp_error->text;
+      return 1;
+    }
+    tmp_error++;
+  }
+
+  return 0;
+}
 
 #if defined(__WIN__)
 static my_bool print_win_error_msg(DWORD error, my_bool verbose)
@@ -211,6 +250,7 @@ int main(int argc,char *argv[])
 {
   int error,code,found;
   const char *msg;
+  const char *name;
   char *unknown_error = 0;
 #if defined(__WIN__)
   my_bool skip_win_message= 0;
@@ -316,6 +356,14 @@ int main(int argc,char *argv[])
         else
           puts(msg);
       }
+      if (get_ER_error_msg(code, & name, & msg))
+      {
+        found= 1;
+        if (verbose)
+          printf("MySQL error code %3d (%s): %s\n", code, name, msg);
+        else
+          puts(msg);
+      }
       if (!found)
       {
 #if defined(__WIN__)

=== modified file 'include/atomic/x86-gcc.h'
--- a/include/atomic/x86-gcc.h	2009-12-21 13:08:11 +0000
+++ b/include/atomic/x86-gcc.h	2010-02-19 14:20:29 +0000
@@ -88,7 +88,7 @@
 */
 #define make_atomic_add_body64                                  \
   int64 tmp=*a;                                                 \
-  while (!my_atomic_cas64(a, &tmp, tmp+v));                     \
+  while (!my_atomic_cas64(a, &tmp, tmp+v)) ;                    \
   v=tmp;
 
 /*

=== modified file 'include/my_atomic.h'
--- a/include/my_atomic.h	2010-01-28 10:09:05 +0000
+++ b/include/my_atomic.h	2010-02-23 15:49:21 +0000
@@ -77,13 +77,13 @@
 #ifndef make_atomic_add_body
 #define make_atomic_add_body(S)                                 \
   int ## S tmp=*a;                                              \
-  while (!my_atomic_cas ## S(a, &tmp, tmp+v));                  \
+  while (!my_atomic_cas ## S(a, &tmp, tmp+v)) ;                 \
   v=tmp;
 #endif
 #ifndef make_atomic_fas_body
 #define make_atomic_fas_body(S)                                 \
   int ## S tmp=*a;                                              \
-  while (!my_atomic_cas ## S(a, &tmp, v));                      \
+  while (!my_atomic_cas ## S(a, &tmp, v)) ;                     \
   v=tmp;
 #endif
 #ifndef make_atomic_load_body

=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2010-02-06 16:13:42 +0000
+++ b/libmysqld/lib_sql.cc	2010-02-23 19:25:38 +0000
@@ -118,6 +118,7 @@ emb_advanced_command(MYSQL *mysql, enum 
   net_clear_error(net);
   thd->current_stmt= stmt;
 
+  thd->thread_stack= (char*) &thd;
   thd->store_globals();				// Fix if more than one connect
   /* 
      We have to call free_old_query before we start to fill mysql->fields 

=== modified file 'mysql-test/CMakeLists.txt'
--- a/mysql-test/CMakeLists.txt	2010-01-24 15:23:16 +0000
+++ b/mysql-test/CMakeLists.txt	2010-02-24 19:19:24 +0000
@@ -23,6 +23,7 @@ INSTALL(
  PATTERN "mtr.out*" EXCLUDE
  PATTERN ".cvsignore" EXCLUDE
  PATTERN "*.am" EXCLUDE
+ PATTERN "*.in" EXCLUDE
 )
 
 

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-02-22 11:40:41 +0000
+++ b/mysql-test/collections/default.experimental	2010-02-23 12:50:45 +0000
@@ -15,7 +15,6 @@ main.outfile_loaddata @solaris          
 main.plugin                              # Bug#47146 Linking problem with example plugin when dtrace enabled
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.sp-error @windows                   # Bug#43201 2010-02-22 alik sp-error.test fails on Windows debug build in embedded mode. The patch will come from -bugfixing.
 
 rpl.rpl_heartbeat_basic                  # BUG#43828 2009-10-22 luis fails sporadically
 rpl.rpl_heartbeat_2slaves                # BUG#43828 2009-10-22 luis fails sporadically
@@ -24,7 +23,6 @@ rpl.rpl_innodb_bug30888* @solaris       
 rpl.rpl_killed_ddl @windows              # Bug#47638 2010-01-20 alik The rpl_killed_ddl test fails on Windows
 rpl.rpl_plugin_load*  @solaris           # Bug#47146
 rpl.rpl_row_sp011* @solaris              # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-rpl.rpl_timezone*                        # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 

=== modified file 'mysql-test/include/cleanup_fake_relay_log.inc'
--- a/mysql-test/include/cleanup_fake_relay_log.inc	2008-12-29 16:04:10 +0000
+++ b/mysql-test/include/cleanup_fake_relay_log.inc	2010-02-19 19:37:23 +0000
@@ -8,9 +8,10 @@
 
 --echo Cleaning up after setup_fake_relay_log.inc
 
-# Remove files.
-remove_file $_fake_relay_log;
-remove_file $_fake_relay_index;
 --disable_query_log
+--disable_warnings
+STOP SLAVE SQL_THREAD;
+RESET SLAVE;
 eval SET @@global.relay_log_purge= $_fake_relay_log_purge;
+--enable_warnings
 --enable_query_log

=== modified file 'mysql-test/include/default_mysqld.cnf'
--- a/mysql-test/include/default_mysqld.cnf	2010-02-05 12:05:37 +0000
+++ b/mysql-test/include/default_mysqld.cnf	2010-02-17 09:18:17 +0000
@@ -17,7 +17,7 @@
 [mysqld]
 open-files-limit=           1024
 local-infile
-default-character-set=      latin1
+character-set-server=      latin1
 
 # Increase default connect_timeout to avoid intermittent
 # disconnects when test servers are put under load see BUG#28359

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2010-02-16 19:49:21 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2010-02-23 13:18:24 +0000
@@ -201,6 +201,8 @@ INSERT INTO global_suppressions VALUES
  ("==[0-9]*== For more details"),
  /* This comes with innodb plugin tests */
  ("==[0-9]*== Warning: set address range perms: large range"),
+ /* valgrind-3.5.0 dumps this */
+ ("==[0-9]*== Command: "),
 
  /* valgrind warnings: invalid file descriptor -1 in syscall
     write()/read(). Bug #50414 */

=== modified file 'mysql-test/include/setup_fake_relay_log.inc'
--- a/mysql-test/include/setup_fake_relay_log.inc	2010-02-03 17:22:58 +0000
+++ b/mysql-test/include/setup_fake_relay_log.inc	2010-02-16 19:34:34 +0000
@@ -66,8 +66,16 @@ let $_fake_relay_index= $MYSQLD_DATADIR/
 # CHANGE MASTER modifies it (see the manual for CHANGE MASTER).
 let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`;
 
+# Reset slave and remove relay log and index files if they exist
+RESET SLAVE;
+error 0,1;
+remove_file $MYSQLD_DATADIR/$_fake_filename.000001;
+error 0,1;
+remove_file $MYSQLD_DATADIR/$_fake_filename.index;
+
 # Create relay log file.
 copy_file $fake_relay_log $_fake_relay_log;
+
 # Create relay log index.
 
 # After patch for BUG#12190, the filename used in CHANGE MASTER
@@ -77,28 +85,12 @@ copy_file $fake_relay_log $_fake_relay_l
 
 if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
 {
-  -- let $_index_entry= ./$_fake_filename-fake.000001
+  eval select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
 }
 
 if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`)
 {
-  -- let $_index_entry= .\\\\$_fake_filename-fake.000001
-}
-
-if (`SELECT LENGTH(@@secure_file_priv) > 0`)
-{
-  -- let $_file_priv_dir= `SELECT @@secure_file_priv`;
-  -- let $_suffix= `SELECT UUID()`
-  -- let $_tmp_file= $_file_priv_dir/fake-index.$_suffix
-
-  -- eval select '$_index_entry\n' into dumpfile '$_tmp_file'
-  -- copy_file $_tmp_file $_fake_relay_index
-  -- remove_file $_tmp_file
-}
-
-if (`SELECT LENGTH(@@secure_file_priv) = 0`)
-{
-  -- eval select '$_index_entry\n' into dumpfile '$_fake_relay_index'
+  eval select '.\\\\$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
 }
 
 # Setup replication from existing relay log.

=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2010-02-07 11:41:24 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2010-02-23 12:50:45 +0000
@@ -152,7 +152,6 @@ our $exe_mysqldump;
 our $exe_mysqlslap;
 our $exe_mysqlimport;
 our $exe_mysqlshow;
-our $exe_mysql_fix_system_tables;
 our $file_mysql_fix_privilege_tables;
 our $exe_mysqltest;
 our $exe_ndbd;
@@ -805,7 +804,7 @@ sub command_line_setup () {
                                     "$glob_basedir/sql/share",
                                     "$glob_basedir/share");
 
-  $path_language=      mtr_path_exists("$path_share/english");
+  $path_language=      mtr_path_exists("$path_share");
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
 
 
@@ -1468,7 +1467,7 @@ sub collect_mysqld_features () {
   #
   # --datadir must exist, mysqld will chdir into it
   #
-  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`;
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --lc-messages-dir=$path_language --skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {
@@ -1680,14 +1679,6 @@ sub executable_setup () {
       $exe_mysql_upgrade= "";
     }
 
-    if ( ! $glob_win32 )
-    {
-      # Look for mysql_fix_system_table script
-      $exe_mysql_fix_system_tables=
-        mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",
-  			"$path_client_bindir/mysql_fix_privilege_tables");
-    }
-
     # Look for mysql_fix_privilege_tables.sql script
     $file_mysql_fix_privilege_tables=
       mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
@@ -1812,7 +1803,7 @@ sub mysql_client_test_arguments()
   if ( $glob_use_embedded_server )
   {
     mtr_add_arg($args,
-      " -A --language=$path_language");
+      " -A --lc-messages-dir=$path_language");
     mtr_add_arg($args,
       " -A --datadir=$slave->[0]->{'path_myddir'}");
     mtr_add_arg($args,
@@ -2159,20 +2150,6 @@ sub environment_setup () {
     $ENV{'MYSQL_UPGRADE'}= mysql_upgrade_arguments();
   }
 
-  # ----------------------------------------------------
-  # Setup env so childs can execute mysql_fix_system_tables
-  # ----------------------------------------------------
-  if ( !$opt_extern && ! $glob_win32 )
-  {
-    my $cmdline_mysql_fix_system_tables=
-      "$exe_mysql_fix_system_tables --no-defaults --host=localhost " .
-      "--user=root --password= " .
-      "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
-      "--port=$master->[0]->{'port'} " .
-      "--socket=$master->[0]->{'path_sock'}";
-    $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
-
-  }
   $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}=  $file_mysql_fix_privilege_tables;
 
   # ----------------------------------------------------

@@ -3163,7 +3140,7 @@ sub install_db ($$) {
 
   if ( ! $glob_netware )
   {
-    mtr_add_arg($args, "--language=%s", $path_language);
+    mtr_add_arg($args, "--lc-messages-dir=%s", $path_language);
     mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
   }
 
@@ -3288,10 +3265,10 @@ socket              = $instance->{path_s
 pid-file            = $instance->{path_pid}
 port                = $instance->{port}
 datadir             = $instance->{path_datadir}
+lc-messages-dir     = $path_language
 log                 = $instance->{path_datadir}/mysqld$server_id.log
 log-error           = $instance->{path_datadir}/mysqld$server_id.err.log
 log-slow-queries    = $instance->{path_datadir}/mysqld$server_id.slow.log
-language            = $path_language
 character-sets-dir  = $path_charsetsdir
 basedir             = $path_my_basedir
 server_id           = $server_id
@@ -3608,7 +3585,7 @@ sub run_testcase ($) {
   {
     mtr_timer_stop_all($glob_timers);
     mtr_report("\nServers started, exiting");
-    if ($glob_win32_perl)
+    if ($glob_win32_perl)
     {
       #ActiveState perl hangs  when using normal exit, use  POSIX::_exit instead
       use POSIX qw[ _exit ]; 
@@ -3898,8 +3875,8 @@ sub mysqld_arguments ($$$$) {
     mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
   }
 
-  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
-  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
+  mtr_add_arg($args, "%s--character-set-server=latin1", $prefix);
+  mtr_add_arg($args, "%s--lc-messages-dir=%s", $prefix, $path_language);
   mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
 
   # Increase default connect_timeout to avoid intermittent

=== modified file 'mysql-test/r/errors.result'
--- a/mysql-test/r/errors.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/r/errors.result	2010-02-23 18:43:26 +0000
@@ -61,10 +61,10 @@ create table t1 (a int unique);
 create table t2 (a int);
 drop function if exists f1;
 Warnings:
-Note	1305	FUNCTION f1 does not exist
+Note	1305	FUNCTION test.f1 does not exist
 drop function if exists f2;
 Warnings:
-Note	1305	FUNCTION f2 does not exist
+Note	1305	FUNCTION test.f2 does not exist
 create function f1() returns int
 begin
 insert into t1 (a) values (1);

=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2010-01-30 19:37:52 +0000
+++ b/mysql-test/r/func_time.result	2010-02-17 09:18:17 +0000
@@ -678,11 +678,6 @@ timestampadd(WEEK, 1, date)
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
 timestampadd(SQL_TSI_SECOND, 1, date)
 2003-01-02 00:00:01
-select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
-timestampadd(SQL_TSI_FRAC_SECOND, 1, date)
-2003-01-02 00:00:00.000001
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 a
 3
@@ -713,11 +708,6 @@ a
 select timestampdiff(SQL_TSI_SECOND, '2001-02-01 12:59:59', '2001-05-01 12:58:58') as a;
 a
 7689539
-select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
-a
-7689538999999
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
 timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
 timestampdiff(SQL_TSI_DAY, '1996-02-01', '1996-03-01') as a3,
@@ -1082,13 +1072,6 @@ week(20061108), week(20061108.01), week(
 isnull(week(now() + 0))	isnull(week(now() + 0.2))	week(20061108)	week(20061108.01)	week(20061108085411.000002)
 0	0	45	45	45
 End of 4.1 tests
-explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
-timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-Note	1003	select timestampdiff(WEEK,'2001-02-01','2001-05-01') AS `a1`,timestampdiff(SECOND_FRAC,'2001-02-01 12:59:59.120000','2001-05-01 12:58:58.119999') AS `a2`
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
 100 100 04 04 4
@@ -1282,24 +1265,6 @@ DATE_ADD(20071108,         INTERVAL 1 DA
 select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
 LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND
 2007-12-30 23:59:59
-SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
-TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18')
-2008-02-18 00:00:00.000001
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
-TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18')
-86400000000
-Warnings:
-Warning	1287	The syntax 'FRAC_SECOND' is deprecated and will be removed in MySQL 6.2. Please use MICROSECOND instead
-SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
-SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND)' at line 1
-SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
-SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FRAC_SECOND' at line 1
 select date_add('1000-01-01 00:00:00', interval '1.03:02:01.05' day_microsecond);
 date_add('1000-01-01 00:00:00', interval '1.03:02:01.05' day_microsecond)
 1000-01-02 03:02:01.050000

=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2009-11-06 14:20:27 +0000
+++ b/mysql-test/r/grant.result	2010-02-23 18:43:26 +0000
@@ -1231,7 +1231,7 @@ Warnings:
 Note	1051	Unknown table 'test'
 drop function if exists test_function;
 Warnings:
-Note	1305	FUNCTION test_function does not exist
+Note	1305	FUNCTION test.test_function does not exist
 drop view if exists v1;
 Warnings:
 Note	1051	Unknown table 'test.v1'

=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2010-02-01 23:22:16 +0000
+++ b/mysql-test/r/innodb_mysql.result	2010-02-17 10:24:53 +0000
@@ -2297,3 +2297,28 @@ t2	CREATE TABLE `t2` (
   CONSTRAINT `x` FOREIGN KEY (`fk`) REFERENCES `t1` (`pk`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t2, t1;
+#
+# Bug#44613 SELECT statement inside FUNCTION takes a shared lock
+#
+DROP TABLE IF EXISTS t1;
+DROP FUNCTION IF EXISTS f1;
+CREATE TABLE t1(x INT PRIMARY KEY, y INT) ENGINE=innodb;
+INSERT INTO t1 VALUES (1, 0), (2, 0);
+CREATE FUNCTION f1(z INT) RETURNS INT READS SQL DATA
+RETURN (SELECT x FROM t1 WHERE x = z);
+# Connection default
+START TRANSACTION;
+SELECT f1(1);
+f1(1)
+1
+# Connection con2
+START TRANSACTION;
+SELECT f1(1);
+f1(1)
+1
+UPDATE t1 SET y = 1 WHERE x = 1;
+COMMIT;
+# Connection default
+COMMIT;
+DROP TABLE t1;
+DROP FUNCTION f1;

=== modified file 'mysql-test/r/locale.result'
--- a/mysql-test/r/locale.result	2009-11-06 09:52:45 +0000
+++ b/mysql-test/r/locale.result	2010-02-17 09:18:17 +0000
@@ -51,7 +51,7 @@ DROP TABLE t1;
 #
 SET lc_messages=sr_YU;
 Warnings:
-Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
+Warning	1287	'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
 SHOW VARIABLES LIKE 'lc_messages';
 Variable_name	Value
 lc_messages	sr_RS

=== modified file 'mysql-test/r/mysqlbinlog.result'
--- a/mysql-test/r/mysqlbinlog.result	2010-01-30 21:29:13 +0000
+++ b/mysql-test/r/mysqlbinlog.result	2010-02-17 09:18:17 +0000
@@ -187,7 +187,7 @@ DELIMITER ;
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
---- --position --
+--- --start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
@@ -388,7 +388,7 @@ DELIMITER ;
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
---- --position --
+--- --start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-02-16 22:19:47 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-02-22 13:22:31 +0000
@@ -97,12 +97,6 @@ The following options may be given as th
  --date-format=name  The DATE format (ignored)
  --datetime-format=name 
  The DATETIME format (ignored)
- -C, --default-character-set=name 
- Set the default character set (deprecated option, use
- --character-set-server instead).
- --default-collation=name 
- Set the default collation (deprecated option, use
- --collation-server instead).
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 
@@ -111,10 +105,6 @@ The following options may be given as th
  The default week format used by WEEK() functions
  --delay-key-write[=name] 
  Type of DELAY_KEY_WRITE
- --delay-key-write-for-all-tables 
- Don't flush key buffers between writes for any MyISAM
- table (Deprecated option, use --delay-key-write=all
- instead).
  --delayed-insert-limit=# 
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
@@ -134,7 +124,6 @@ The following options may be given as th
  --div-precision-increment=# 
  Precision of the result of '/' operator will be increased
  on that value
- --enable-locking    Deprecated option, use --external-locking instead.
  --engine-condition-pushdown 
  Push supported query conditions to the storage engine.
  Deprecated, use --optimizer-switch instead.
@@ -241,10 +230,6 @@ The following options may be given as th
  can safely set this to TRUE
  --log-error[=name]  Error log file
  --log-isam[=name]   Log all MyISAM changes to file.
- -0, --log-long-format 
- Log some extra information to update log. Please note
- that this option is deprecated; see --log-short-format
- option.
  --log-output=name   Syntax: log-output=value[,value...], where "value" could
  be TABLE, FILE or NONE
  --log-queries-not-using-indexes 
@@ -271,9 +256,6 @@ The following options may be given as th
  transactions that affect more than one storage engine,
  when binary log is disabled)
  --log-tc-size=#     Size of transaction coordinator log.
- --log-update[=name] The update log is deprecated since version 5.0, is
- replaced by the binary log and this option justs turns on
- --log-bin instead.
  -W, --log-warnings[=#] 
  Log some not critical warnings to the log file
  --long-query-time=# Log all queries that have taken more than long_query_time
@@ -502,7 +484,6 @@ The following options may be given as th
  When reading rows in sorted order after a sort, the rows
  are read through this buffer to avoid a disk seeks. If
  not set, then it's set to the value of record_buffer
- --record-buffer=#   Deprecated; use --read-buffer-size instead.
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  The location and name to use for the file that keeps a
@@ -599,8 +580,6 @@ The following options may be given as th
  --rpl-recovery-rank=# 
  Unused, will be removed
  --safe-mode         Skip some optimize stages (for testing).
- --safe-show-database 
- Deprecated option; use GRANT SHOW DATABASES instead...
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old
@@ -610,16 +589,11 @@ The following options may be given as th
  files within specified directory
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
- -O, --set-variable=name 
- Change the value of a variable. Please note that this
- option is deprecated;you can set variables directly with
- --variable-name=value.
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this master
  --skip-grant-tables Start without grant tables. This gives all users FULL
  ACCESS to all tables!
  --skip-host-cache   Don't cache host names.
- --skip-locking      Deprecated option, use --skip-external-locking instead.
  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
  'localhost'.
  --skip-networking   Don't allow connection with TCP/IP
@@ -628,8 +602,6 @@ The following options may be given as th
  Don't allow 'SHOW DATABASE' commands
  --skip-slave-start  If set, slave is not autostarted.
  --skip-stack-trace  Don't print a stack trace on failure.
- --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
- --skip-symbolic-links instead.
  --skip-thread-priority 
  Don't give threads different priorities. This option is
  deprecated because it has no effect; the implied behavior
@@ -681,10 +653,6 @@ The following options may be given as th
  --sporadic-binlog-dump-fail 
  Option used by mysql-test for debugging and testing of
  replication.
- --sql-bin-update-same 
- The update log is deprecated since version 5.0, is
- replaced by the binary log and this option does nothing
- anymore.
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
  -s, --symbolic-links 
@@ -752,7 +720,6 @@ The following options may be given as th
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
- -W, --warnings[=#]  Deprecated; use --log-warnings instead.
 
 Variables (--variable-name=value)
 abort-slave-event-count 0
@@ -780,8 +747,6 @@ connect-timeout 10
 console FALSE
 date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
-default-character-set latin1
-default-collation latin1_swedish_ci
 default-storage-engine MyISAM
 default-time-zone (No default value)
 default-week-format 0
@@ -791,7 +756,6 @@ delayed-insert-timeout 300
 delayed-queue-size 1000
 disconnect-slave-event-count 0
 div-precision-increment 4
-enable-locking FALSE
 engine-condition-pushdown TRUE
 event-scheduler OFF
 expire-logs-days 0
@@ -839,7 +803,6 @@ log-slow-admin-statements FALSE
 log-slow-slave-statements FALSE
 log-tc tc.log
 log-tc-size 24576
-log-update (No default value)
 log-warnings 1
 long-query-time 10
 low-priority-updates FALSE
@@ -921,7 +884,6 @@ range-alloc-block-size 4096
 read-buffer-size 131072
 read-only FALSE
 read-rnd-buffer-size 262144
-record-buffer 131072
 relay-log (No default value)
 relay-log-index (No default value)
 relay-log-info-file relay-log.info
@@ -979,7 +941,6 @@ updatable-views-with-limit YES
 use-symbolic-links FALSE
 verbose TRUE
 wait-timeout 28800
-warnings 1
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2010-02-16 22:19:47 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-02-22 13:22:31 +0000
@@ -97,12 +97,6 @@ The following options may be given as th
  --date-format=name  The DATE format (ignored)
  --datetime-format=name 
  The DATETIME format (ignored)
- -C, --default-character-set=name 
- Set the default character set (deprecated option, use
- --character-set-server instead).
- --default-collation=name 
- Set the default collation (deprecated option, use
- --collation-server instead).
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 
@@ -111,10 +105,6 @@ The following options may be given as th
  The default week format used by WEEK() functions
  --delay-key-write[=name] 
  Type of DELAY_KEY_WRITE
- --delay-key-write-for-all-tables 
- Don't flush key buffers between writes for any MyISAM
- table (Deprecated option, use --delay-key-write=all
- instead).
  --delayed-insert-limit=# 
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
@@ -134,7 +124,6 @@ The following options may be given as th
  --div-precision-increment=# 
  Precision of the result of '/' operator will be increased
  on that value
- --enable-locking    Deprecated option, use --external-locking instead.
  --engine-condition-pushdown 
  Push supported query conditions to the storage engine.
  Deprecated, use --optimizer-switch instead.
@@ -240,10 +229,6 @@ The following options may be given as th
  can safely set this to TRUE
  --log-error[=name]  Error log file
  --log-isam[=name]   Log all MyISAM changes to file.
- -0, --log-long-format 
- Log some extra information to update log. Please note
- that this option is deprecated; see --log-short-format
- option.
  --log-output=name   Syntax: log-output=value[,value...], where "value" could
  be TABLE, FILE or NONE
  --log-queries-not-using-indexes 
@@ -270,9 +255,6 @@ The following options may be given as th
  transactions that affect more than one storage engine,
  when binary log is disabled)
  --log-tc-size=#     Size of transaction coordinator log.
- --log-update[=name] The update log is deprecated since version 5.0, is
- replaced by the binary log and this option justs turns on
- --log-bin instead.
  -W, --log-warnings[=#] 
  Log some not critical warnings to the log file
  --long-query-time=# Log all queries that have taken more than long_query_time
@@ -502,7 +484,6 @@ The following options may be given as th
  When reading rows in sorted order after a sort, the rows
  are read through this buffer to avoid a disk seeks. If
  not set, then it's set to the value of record_buffer
- --record-buffer=#   Deprecated; use --read-buffer-size instead.
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  The location and name to use for the file that keeps a
@@ -599,8 +580,6 @@ The following options may be given as th
  --rpl-recovery-rank=# 
  Unused, will be removed
  --safe-mode         Skip some optimize stages (for testing).
- --safe-show-database 
- Deprecated option; use GRANT SHOW DATABASES instead...
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old
@@ -610,10 +589,6 @@ The following options may be given as th
  files within specified directory
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
- -O, --set-variable=name 
- Change the value of a variable. Please note that this
- option is deprecated;you can set variables directly with
- --variable-name=value.
  --shared-memory     Enable the shared memory
  --shared-memory-base-name=name 
  Base name of shared memory
@@ -622,7 +597,6 @@ The following options may be given as th
  --skip-grant-tables Start without grant tables. This gives all users FULL
  ACCESS to all tables!
  --skip-host-cache   Don't cache host names.
- --skip-locking      Deprecated option, use --skip-external-locking instead.
  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
  'localhost'.
  --skip-networking   Don't allow connection with TCP/IP
@@ -631,8 +605,6 @@ The following options may be given as th
  Don't allow 'SHOW DATABASE' commands
  --skip-slave-start  If set, slave is not autostarted.
  --skip-stack-trace  Don't print a stack trace on failure.
- --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
- --skip-symbolic-links instead.
  --skip-thread-priority 
  Don't give threads different priorities. This option is
  deprecated because it has no effect; the implied behavior
@@ -684,10 +656,6 @@ The following options may be given as th
  --sporadic-binlog-dump-fail 
  Option used by mysql-test for debugging and testing of
  replication.
- --sql-bin-update-same 
- The update log is deprecated since version 5.0, is
- replaced by the binary log and this option does nothing
- anymore.
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
  --standalone        Dummy option to start as a standalone program (NT).
@@ -756,7 +724,6 @@ The following options may be given as th
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
- -W, --warnings[=#]  Deprecated; use --log-warnings instead.
 
 Variables (--variable-name=value)
 abort-slave-event-count 0
@@ -784,8 +751,6 @@ connect-timeout 10
 console FALSE
 date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
-default-character-set latin1
-default-collation latin1_swedish_ci
 default-storage-engine MyISAM
 default-time-zone (No default value)
 default-week-format 0
@@ -795,7 +760,6 @@ delayed-insert-timeout 300
 delayed-queue-size 1000
 disconnect-slave-event-count 0
 div-precision-increment 4
-enable-locking FALSE
 engine-condition-pushdown TRUE
 event-scheduler OFF
 expire-logs-days 0
@@ -842,7 +806,6 @@ log-slow-admin-statements FALSE
 log-slow-slave-statements FALSE
 log-tc tc.log
 log-tc-size 24576
-log-update (No default value)
 log-warnings 1
 long-query-time 10
 low-priority-updates FALSE
@@ -925,7 +888,6 @@ range-alloc-block-size 4096
 read-buffer-size 131072
 read-only FALSE
 read-rnd-buffer-size 262144
-record-buffer 131072
 relay-log (No default value)
 relay-log-index (No default value)
 relay-log-info-file relay-log.info
@@ -985,7 +947,6 @@ updatable-views-with-limit YES
 use-symbolic-links FALSE
 verbose TRUE
 wait-timeout 28800
-warnings 1
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.

=== modified file 'mysql-test/r/perror-win.result'
--- a/mysql-test/r/perror-win.result	2008-11-28 13:12:43 +0000
+++ b/mysql-test/r/perror-win.result	2010-02-24 07:22:19 +0000
@@ -2,5 +2,6 @@ MySQL error code 150: Foreign key constr
 Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
 OS error code  23:  Too many open files in system
 Win32 error code 23: Data error (cyclic redundancy check).
+MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
 Win32 error code 1062: The service has not been started.
 Illegal error code: 30000

=== modified file 'mysql-test/r/perror.result'
--- a/mysql-test/r/perror.result	2006-08-01 09:29:10 +0000
+++ b/mysql-test/r/perror.result	2010-02-24 00:45:49 +0000
@@ -1 +1,6 @@
 Illegal error code: 10000
+MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
+MySQL error code 1076 (ER_READY): %s: ready for connections.
+Version: '%s'  socket: '%s'  port: %d
+MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Table upgrade required. Please do "REPAIR TABLE `%-.32s`" or dump/reload to fix it!
+MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %lu)

=== modified file 'mysql-test/r/signal.result'
--- a/mysql-test/r/signal.result	2009-10-21 10:48:22 +0000
+++ b/mysql-test/r/signal.result	2010-02-23 18:43:26 +0000
@@ -2181,7 +2181,7 @@ drop procedure peter_p1 $$
 drop procedure peter_p2 $$
 drop procedure if exists peter_p3 $$
 Warnings:
-Note	1305	PROCEDURE peter_p3 does not exist
+Note	1305	PROCEDURE test.peter_p3 does not exist
 create procedure peter_p3()
 begin
 declare continue handler for sqlexception

=== modified file 'mysql-test/r/sp-error.result'
--- a/mysql-test/r/sp-error.result	2010-02-04 22:08:08 +0000
+++ b/mysql-test/r/sp-error.result	2010-02-23 18:43:26 +0000
@@ -46,7 +46,7 @@ call foo()|
 ERROR 42000: PROCEDURE test.foo does not exist
 drop procedure if exists foo|
 Warnings:
-Note	1305	PROCEDURE foo does not exist
+Note	1305	PROCEDURE test.foo does not exist
 show create procedure foo|
 ERROR 42000: PROCEDURE foo does not exist
 show create function foo|
@@ -1028,7 +1028,7 @@ drop table t1|
 drop function bug_13627_f|
 drop function if exists bug12329;
 Warnings:
-Note	1305	FUNCTION bug12329 does not exist
+Note	1305	FUNCTION test.bug12329 does not exist
 create table t1 as select 1 a;
 create table t2 as select 1 a;
 create function bug12329() returns int return (select a from t1);

=== modified file 'mysql-test/r/sp-vars.result'
--- a/mysql-test/r/sp-vars.result	2009-10-09 13:34:07 +0000
+++ b/mysql-test/r/sp-vars.result	2010-02-23 18:43:26 +0000
@@ -394,10 +394,10 @@ CASE expression tests.
 
 DROP PROCEDURE IF EXISTS p1;
 Warnings:
-Note	1305	PROCEDURE p1 does not exist
+Note	1305	PROCEDURE test.p1 does not exist
 DROP PROCEDURE IF EXISTS p2;
 Warnings:
-Note	1305	PROCEDURE p2 does not exist
+Note	1305	PROCEDURE test.p2 does not exist
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'

=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/r/sp.result	2010-02-23 18:43:26 +0000
@@ -2695,10 +2695,10 @@ delete from t3|
 insert into t3 values(1)|
 drop procedure if exists bug7992_1|
 Warnings:
-Note	1305	PROCEDURE bug7992_1 does not exist
+Note	1305	PROCEDURE test.bug7992_1 does not exist
 drop procedure if exists bug7992_2|
 Warnings:
-Note	1305	PROCEDURE bug7992_2 does not exist
+Note	1305	PROCEDURE test.bug7992_2 does not exist
 create procedure bug7992_1()
 begin
 declare i int;

=== modified file 'mysql-test/r/sp_notembedded.result'
--- a/mysql-test/r/sp_notembedded.result	2009-10-19 13:36:19 +0000
+++ b/mysql-test/r/sp_notembedded.result	2010-02-23 18:43:26 +0000
@@ -21,11 +21,11 @@ end|
 call bug4902_2()|
 show warnings|
 Level	Code	Message
-Note	1305	PROCEDURE bug4902_2 does not exist
+Note	1305	PROCEDURE test.bug4902_2 does not exist
 call bug4902_2()|
 show warnings|
 Level	Code	Message
-Note	1305	PROCEDURE bug4902_2 does not exist
+Note	1305	PROCEDURE test.bug4902_2 does not exist
 drop procedure bug4902_2|
 drop table if exists t1|
 create table t1 (

=== modified file 'mysql-test/r/strict.result'
--- a/mysql-test/r/strict.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/r/strict.result	2010-02-23 18:43:26 +0000
@@ -1183,7 +1183,7 @@ drop table t1;
 create table t1 (col1 tinyint);
 drop procedure if exists t1;
 Warnings:
-Note	1305	PROCEDURE t1 does not exist
+Note	1305	PROCEDURE test.t1 does not exist
 create procedure t1 () begin declare exit handler for sqlexception
 select'a'; insert into t1 values (200); end;|
 call t1();

=== modified file 'mysql-test/r/udf.result'
--- a/mysql-test/r/udf.result	2009-12-01 21:25:51 +0000
+++ b/mysql-test/r/udf.result	2010-02-23 18:43:26 +0000
@@ -392,6 +392,52 @@ a
 4
 DROP FUNCTION sequence;
 DROP TABLE t1,t2;
+drop function if exists test.metaphon;
+drop function if exists metaphon;
+CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+select metaphon("Hello");
+metaphon("Hello")
+HL
+drop function if exists test.metaphon;
+Warnings:
+Note	1305	FUNCTION test.metaphon does not exist
+select metaphon("Hello");
+metaphon("Hello")
+HL
+drop function metaphon;
+CREATE FUNCTION test.metaphon(a TEXT) RETURNS TEXT return "This is a SF";
+create database db_31767;
+use db_31767;
+CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+use test;
+select metaphon("Hello");
+metaphon("Hello")
+HL
+select test.metaphon("Hello");
+test.metaphon("Hello")
+This is a SF
+drop function metaphon;
+select metaphon("Hello");
+metaphon("Hello")
+This is a SF
+drop function metaphon;
+use db_31767;
+drop database db_31767;
+drop function if exists no_such_func;
+Warnings:
+Note	1305	FUNCTION (UDF) no_such_func does not exist
+drop function no_such_func;
+ERROR 42000: FUNCTION (UDF) no_such_func does not exist
+drop function if exists test.no_such_func;
+Warnings:
+Note	1305	FUNCTION test.no_such_func does not exist
+drop function test.no_such_func;
+ERROR 42000: FUNCTION test.no_such_func does not exist
+drop procedure if exists no_such_proc;
+ERROR 3D000: No database selected
+drop procedure no_such_proc;
+ERROR 3D000: No database selected
+use test;
 #
 # Bug#46259: 5.0.83 -> 5.1.36, query doesn't work
 #

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2010-02-15 12:11:20 +0000
+++ b/mysql-test/r/variables.result	2010-02-20 09:40:21 +0000
@@ -569,9 +569,6 @@ set sql_big_tables=1;
 set sql_buffer_result=1;
 set sql_log_bin=1;
 set sql_log_off=1;
-set sql_log_update=1;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
 set sql_low_priority_updates=1;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;

=== modified file 'mysql-test/r/view.result'
--- a/mysql-test/r/view.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/r/view.result	2010-02-23 18:43:26 +0000
@@ -2086,7 +2086,7 @@ CREATE TABLE t1 ( bug_table_seq   INTEGE
 CREATE OR REPLACE VIEW v1 AS SELECT * from t1;
 DROP PROCEDURE IF EXISTS p1;
 Warnings:
-Note	1305	PROCEDURE p1 does not exist
+Note	1305	PROCEDURE test.p1 does not exist
 CREATE PROCEDURE p1 ( )
 BEGIN
 DO (SELECT  @next := IFNULL(max(bug_table_seq),0) + 1 FROM v1);
@@ -4004,3 +4004,36 @@ CREATE VIEW t2 AS SELECT * FROM t1;
 ERROR HY000: Can't execute the query because you have a conflicting read lock
 UNLOCK TABLES;
 DROP TABLE t1, t2;
+#
+# Bug#48315 Metadata lock is not taken for merged views that
+#           use an INFORMATION_SCHEMA table
+#
+DROP TABLE IF EXISTS t1;
+DROP VIEW IF EXISTS v1;
+DROP PROCEDURE IF EXISTS p1;
+# Connection default
+CREATE VIEW v1 AS SELECT schema_name FROM information_schema.schemata;
+CREATE TABLE t1 (str VARCHAR(50));
+CREATE PROCEDURE p1() INSERT INTO t1 SELECT * FROM v1;
+# CALL p1() so the view is merged.
+CALL p1();
+# Connection 3
+LOCK TABLE t1 READ;
+# Connection default
+# Try to CALL p1() again, this time it should block for t1.
+# Sending:
+CALL p1();
+# Connection 2
+# ... then try to drop the view. This should block.
+# Sending:
+DROP VIEW v1;
+# Connection 3
+# Now allow CALL p1() to complete
+UNLOCK TABLES;
+# Connection default
+# Reaping: CALL p1()
+# Connection 2
+# Reaping: DROP VIEW v1
+# Connection default
+DROP PROCEDURE p1;
+DROP TABLE t1;

=== modified file 'mysql-test/r/warnings.result'
--- a/mysql-test/r/warnings.result	2009-12-01 19:07:18 +0000
+++ b/mysql-test/r/warnings.result	2010-02-23 18:43:26 +0000
@@ -228,13 +228,13 @@ INSERT INTO t2 VALUES ( 'a`', 'a`' );
 INSERT INTO t3 VALUES ( 'a`', 'a`', '1000-01-1' );
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE test.sp1 does not exist
 DROP PROCEDURE IF EXISTS sp2;
 Warnings:
-Note	1305	PROCEDURE sp2 does not exist
+Note	1305	PROCEDURE test.sp2 does not exist
 DROP PROCEDURE IF EXISTS sp3;
 Warnings:
-Note	1305	PROCEDURE sp3 does not exist
+Note	1305	PROCEDURE test.sp3 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 DECLARE x NUMERIC ZEROFILL;

=== modified file 'mysql-test/suite/funcs_1/r/storedproc.result'
--- a/mysql-test/suite/funcs_1/r/storedproc.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/suite/funcs_1/r/storedproc.result	2010-02-24 12:53:09 +0000
@@ -145,7 +145,7 @@ END//
 ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( f1 DECIMAL(66, 30) )
 LANGUAGE SQL NOT DETERMINISTIC SQL SECURITY INVOKER COMMENT 'this is simple'
 BEGIN
@@ -155,7 +155,7 @@ END//
 ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 DROP TABLE IF EXISTS t1_aux;
 DROP PROCEDURE IF EXISTS sproc_1;
 DROP FUNCTION IF EXISTS func_1;
@@ -1826,7 +1826,7 @@ Note	1051	Unknown table 't1'
 create table mysql.t1( f1 char );
 DROP PROCEDURE IF EXISTS sp11;
 Warnings:
-Note	1305	PROCEDURE sp11 does not exist
+Note	1305	PROCEDURE db_storedproc.sp11 does not exist
 CREATE PROCEDURE sp11() insert into mysql.t1 values('a');
 SELECT security_type from mysql.proc where specific_name='sp11';
 security_type
@@ -1893,7 +1893,7 @@ alter proc
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp11;
 Warnings:
-Note	1305	PROCEDURE sp11 does not exist
+Note	1305	PROCEDURE db_storedproc.sp11 does not exist
 CREATE PROCEDURE sp11()
 SELECT * from t1;
 SELECT comment from mysql.proc where specific_name='sp11';
@@ -1911,7 +1911,7 @@ alter function
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS fn12;
 Warnings:
-Note	1305	FUNCTION fn12 does not exist
+Note	1305	FUNCTION db_storedproc.fn12 does not exist
 CREATE FUNCTION fn12() returns int
 return 100;
 SELECT comment from mysql.proc where specific_name='fn12';
@@ -3115,7 +3115,7 @@ ERROR 42000: You have an error in your S
 return f' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 char ) returns char
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3124,7 +3124,7 @@ return f1;
 ERROR 42000: This version of MySQL doesn't yet support 'return value collation'
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 char ascii ) returns char ascii
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3134,21 +3134,21 @@ ERROR 42000: You have an error in your S
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 char binary not null ) returns char binary not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns char binary not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 char ascii not null ) returns char ascii not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns char ascii not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 tinytext ) returns tinytext
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3167,28 +3167,28 @@ ERROR 42000: You have an error in your S
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 text not null ) returns text not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns text not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 mediumtext not null ) returns mediumtext not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns mediumtext not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 longtext not null ) returns longtext not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns longtext not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 tinyblob ) returns tinyblob
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3207,28 +3207,28 @@ ERROR 42000: You have an error in your S
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 blob not null ) returns blob not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns blob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 mediumblob not null ) returns mediumblob not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns mediumblob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 longblob not null ) returns longblob not null
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'not null ) returns longblob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 binary ) returns binary
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3238,7 +3238,7 @@ ERROR 42000: You have an error in your S
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 tinyint ) returns tinyint
 return f1;
 DROP FUNCTION IF EXISTS fn1;
@@ -3383,21 +3383,21 @@ ERROR 42000: You have an error in your S
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 year(f1 4) ) returns year(4)
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 4) ) returns year(4)
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 enum(f1 "1enum", "2enum") ) returns enum("1enum", "2enum")
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 "1enum", "2enum") ) returns enum("1enum", "2enum")
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(f1 set(f1 "1set", "2set") ) returns set("1set", "2set")
 return f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'f1 "1set", "2set") ) returns set("1set", "2set")
@@ -3410,7 +3410,7 @@ appropriate error message
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp16;
 Warnings:
-Note	1305	PROCEDURE sp16 does not exist
+Note	1305	PROCEDURE db_storedproc.sp16 does not exist
 CALL sp16( 'xyz' );
 ERROR 42000: PROCEDURE db_storedproc.sp16 does not exist
 CREATE DATABASE db1;
@@ -3434,10 +3434,10 @@ function with the same name, even in the
 USE db_storedproc;
 DROP FUNCTION IF EXISTS sp1;
 Warnings:
-Note	1305	FUNCTION sp1 does not exist
+Note	1305	FUNCTION db_storedproc.sp1 does not exist
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1 ()
 BEGIN
 declare x enum( 'db1', 'test' ) default 'test';
@@ -3481,10 +3481,10 @@ a function with the same name, in the sa
 USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 DROP FUNCTION IF EXISTS sp1;
 Warnings:
-Note	1305	FUNCTION sp1 does not exist
+Note	1305	FUNCTION db_storedproc.sp1 does not exist
 set @x=null;
 set @y=null;
 CREATE PROCEDURE sp1()
@@ -3557,16 +3557,16 @@ SET @x = NULL;
 SET @y = NULL;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 DROP FUNCTION IF EXISTS sp1;
 Warnings:
-Note	1305	FUNCTION sp1 does not exist
+Note	1305	FUNCTION db_storedproc.sp1 does not exist
 DROP PROCEDURE IF EXISTS db_storedproc_3122.sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc_3122.sp1 does not exist
 DROP FUNCTION IF EXISTS db_storedproc_3122.sp1;
 Warnings:
-Note	1305	FUNCTION sp1 does not exist
+Note	1305	FUNCTION db_storedproc_3122.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 SET @x = 1;
@@ -3666,7 +3666,7 @@ DROP DATABASE IF EXISTS db1;
 CREATE DATABASE db1;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1 () set @x=1;
 CREATE PROCEDURE sp1 () set @x=2;
 ERROR 42000: PROCEDURE sp1 already exists
@@ -3705,7 +3705,7 @@ Note	1008	Can't drop database 'db1'; dat
 CREATE DATABASE db1;
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1 () returns int return 1;
 CREATE FUNCTION fn1 () returns int return 2;
 ERROR 42000: FUNCTION fn1 already exists
@@ -3739,7 +3739,7 @@ set @x=null;
 set @y=null;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1 () set @x= 1;
 DROP DATABASE IF EXISTS test3124;
 Warnings:
@@ -3768,7 +3768,7 @@ providing each resides in different data
 USE db_storedproc;
 DROP FUNCTION IF EXISTS f1;
 Warnings:
-Note	1305	FUNCTION f1 does not exist
+Note	1305	FUNCTION db_storedproc.f1 does not exist
 CREATE FUNCTION f1 () returns int return 1;
 DROP DATABASE IF EXISTS test3125;
 Warnings:
@@ -8699,7 +8699,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare require char;
@@ -8708,7 +8708,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare restrict char;
@@ -8717,7 +8717,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare return char;
@@ -8726,7 +8726,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare revoke char;
@@ -8735,7 +8735,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare right char;
@@ -8744,7 +8744,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare rlike char;
@@ -8753,7 +8753,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare schema char;
@@ -8762,7 +8762,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare schemas char;
@@ -8771,7 +8771,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare second_microsecond char;
@@ -8780,7 +8780,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare SELECT char;
@@ -8789,7 +8789,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sensitive char;
@@ -8798,7 +8798,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare separator char;
@@ -8807,7 +8807,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare set char;
@@ -8816,7 +8816,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare show char;
@@ -8825,7 +8825,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare smallint char;
@@ -8834,7 +8834,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare spatial char;
@@ -8843,7 +8843,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare specific char;
@@ -8852,7 +8852,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sql char;
@@ -8861,7 +8861,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sqlexception char;
@@ -8870,7 +8870,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sqlstate char;
@@ -8879,7 +8879,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sqlwarning char;
@@ -8888,7 +8888,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sql_big_result char;
@@ -8897,7 +8897,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sql_calc_found_rows char;
@@ -8906,7 +8906,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare sql_small_result char;
@@ -8915,7 +8915,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare ssl char;
@@ -8924,7 +8924,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare starting char;
@@ -8933,7 +8933,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare straight_join char;
@@ -8942,7 +8942,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare table char;
@@ -8951,7 +8951,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare terminated char;
@@ -8960,7 +8960,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare then char;
@@ -8969,7 +8969,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare tinyblob char;
@@ -8978,7 +8978,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare tinyint char;
@@ -8987,7 +8987,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare tinytext char;
@@ -8996,7 +8996,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare to char;
@@ -9005,7 +9005,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare trailing char;
@@ -9014,7 +9014,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare trigger char;
@@ -9023,7 +9023,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare true char;
@@ -9032,7 +9032,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare undo char;
@@ -9041,7 +9041,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare union char;
@@ -9050,7 +9050,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare unique char;
@@ -9059,7 +9059,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare unlock char;
@@ -9068,7 +9068,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare unsigned char;
@@ -9077,7 +9077,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare update char;
@@ -9086,7 +9086,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare usage char;
@@ -9095,7 +9095,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare use char;
@@ -9104,7 +9104,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare using char;
@@ -9113,7 +9113,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare utc_date char;
@@ -9122,7 +9122,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare utc_time char;
@@ -9131,7 +9131,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare utc_timestamp char;
@@ -9140,7 +9140,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare values char;
@@ -9149,7 +9149,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare varbinary char;
@@ -9158,7 +9158,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare varchar char;
@@ -9167,7 +9167,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare varcharacter char;
@@ -9176,7 +9176,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare varying char;
@@ -9185,7 +9185,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare when char;
@@ -9194,7 +9194,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare where char;
@@ -9203,7 +9203,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare while char;
@@ -9212,7 +9212,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare with char;
@@ -9221,7 +9221,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare write char;
@@ -9230,7 +9230,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xor char;
@@ -9239,7 +9239,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare year_month char;
@@ -9248,7 +9248,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare zerofill char;
@@ -9263,7 +9263,7 @@ Ensure that every possible type of condi
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare cond1 condition for sqlstate 'HY000';
@@ -9328,7 +9328,7 @@ CALL sp1();
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare @x char;
@@ -9337,7 +9337,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x char1;
@@ -9346,7 +9346,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare accessible condition for sqlstate '02000';
@@ -9356,7 +9356,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for add set @var' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare add condition for sqlstate '02000';
@@ -9367,7 +9367,7 @@ declare exit handler for add set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare all condition for sqlstate '02000';
@@ -9378,7 +9378,7 @@ declare exit handler for all set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare alter condition for sqlstate '02000';
@@ -9388,7 +9388,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for alter set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare analyze condition for sqlstate '02000';
@@ -9398,7 +9398,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for analyze set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare and condition for sqlstate '02000';
@@ -9409,7 +9409,7 @@ declare exit handler for and set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare as condition for sqlstate '02000';
@@ -9420,7 +9420,7 @@ declare exit handler for as set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare asc condition for sqlstate '02000';
@@ -9431,7 +9431,7 @@ declare exit handler for asc set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare asensitive condition for sqlstate '02000';
@@ -9441,7 +9441,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for asensitive s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare before condition for sqlstate '02000';
@@ -9451,7 +9451,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for before set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare between condition for sqlstate '02000';
@@ -9461,7 +9461,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for between set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare bigint condition for sqlstate '02000';
@@ -9471,7 +9471,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for bigint set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare binary condition for sqlstate '02000';
@@ -9481,7 +9481,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for binary set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare blob condition for sqlstate '02000';
@@ -9491,7 +9491,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for blob set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare both condition for sqlstate '02000';
@@ -9501,7 +9501,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for both set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare by condition for sqlstate '02000';
@@ -9512,7 +9512,7 @@ declare exit handler for by set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare call condition for sqlstate '02000';
@@ -9522,7 +9522,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for CALL set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cascade condition for sqlstate '02000';
@@ -9532,7 +9532,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for cascade set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare case condition for sqlstate '02000';
@@ -9542,7 +9542,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for case set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare change condition for sqlstate '02000';
@@ -9552,7 +9552,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for change set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare char condition for sqlstate '02000';
@@ -9562,7 +9562,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for char set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare character condition for sqlstate '02000';
@@ -9572,7 +9572,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for character set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare check condition for sqlstate '02000';
@@ -9582,7 +9582,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for check set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare collate condition for sqlstate '02000';
@@ -9592,7 +9592,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for collate set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare column condition for sqlstate '02000';
@@ -9602,7 +9602,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for column set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare condition condition for sqlstate '02000';
@@ -9612,7 +9612,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for condition set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare connection condition for sqlstate '02000';
@@ -9628,7 +9628,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for constraint s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare continue condition for sqlstate '02000';
@@ -9638,7 +9638,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for continue set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare convert condition for sqlstate '02000';
@@ -9648,7 +9648,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for convert set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare create condition for sqlstate '02000';
@@ -9658,7 +9658,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for create set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cross condition for sqlstate '02000';
@@ -9668,7 +9668,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for cross set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_date condition for sqlstate '02000';
@@ -9678,7 +9678,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for current_da' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_time condition for sqlstate '02000';
@@ -9688,7 +9688,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for current_ti' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_timestamp condition for sqlstate '02000';
@@ -9698,7 +9698,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for curre' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_user condition for sqlstate '02000';
@@ -9708,7 +9708,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for current_us' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cursor condition for sqlstate '02000';
@@ -9718,7 +9718,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for cursor set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare database condition for sqlstate '02000';
@@ -9728,7 +9728,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for database set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare databases condition for sqlstate '02000';
@@ -9738,7 +9738,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for databases set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_hour condition for sqlstate '02000';
@@ -9748,7 +9748,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for day_hour set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_microsecond condition for sqlstate '02000';
@@ -9758,7 +9758,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for day_mic' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_minute condition for sqlstate '02000';
@@ -9768,7 +9768,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for day_minute s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_second condition for sqlstate '02000';
@@ -9778,7 +9778,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for day_second s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare dec condition for sqlstate '02000';
@@ -9789,7 +9789,7 @@ declare exit handler for dec set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare decimal condition for sqlstate '02000';
@@ -9799,7 +9799,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for decimal set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare declare condition for sqlstate '02000';
@@ -9809,7 +9809,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for declare set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare default condition for sqlstate '02000';
@@ -9819,7 +9819,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for default set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare delayed condition for sqlstate '02000';
@@ -9829,7 +9829,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for delayed set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare delete condition for sqlstate '02000';
@@ -9839,7 +9839,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for delete set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare desc condition for sqlstate '02000';
@@ -9849,7 +9849,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for desc set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare describe condition for sqlstate '02000';
@@ -9859,7 +9859,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for describe set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare deterministic condition for sqlstate '02000';
@@ -9869,7 +9869,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for determini' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare distinct condition for sqlstate '02000';
@@ -9879,7 +9879,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for distinct set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare distinctrow condition for sqlstate '02000';
@@ -9889,7 +9889,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for distinctrow' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare div condition for sqlstate '02000';
@@ -9900,7 +9900,7 @@ declare exit handler for div set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare double condition for sqlstate '02000';
@@ -9910,7 +9910,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for double set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare drop condition for sqlstate '02000';
@@ -9920,7 +9920,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for drop set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare dual condition for sqlstate '02000';
@@ -9930,7 +9930,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for dual set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare each condition for sqlstate '02000';
@@ -9940,7 +9940,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for each set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare else condition for sqlstate '02000';
@@ -9950,7 +9950,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for else set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare elseif condition for sqlstate '02000';
@@ -9960,7 +9960,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for elseif set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare enclosed condition for sqlstate '02000';
@@ -9970,7 +9970,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for enclosed set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare escaped condition for sqlstate '02000';
@@ -9980,7 +9980,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for escaped set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare exists condition for sqlstate '02000';
@@ -9990,7 +9990,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for exists set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare exit condition for sqlstate '02000';
@@ -10001,7 +10001,7 @@ declare exit handler for exit set @var2 
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare explain condition for sqlstate '02000';
@@ -10011,7 +10011,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for explain set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare false condition for sqlstate '02000';
@@ -10021,7 +10021,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for false set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare fetch condition for sqlstate '02000';
@@ -10031,7 +10031,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for fetch set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float condition for sqlstate '02000';
@@ -10041,7 +10041,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for float set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float4 condition for sqlstate '02000';
@@ -10051,7 +10051,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for add set @var2 = ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float8 condition for sqlstate '02000';
@@ -10061,7 +10061,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for add set @var2 = ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare for condition for sqlstate '02000';
@@ -10072,7 +10072,7 @@ declare exit handler for for set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare force condition for sqlstate '02000';
@@ -10082,7 +10082,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for force set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare foreign condition for sqlstate '02000';
@@ -10092,7 +10092,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for foreign set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare from condition for sqlstate '02000';
@@ -10102,7 +10102,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for from set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare fulltext condition for sqlstate '02000';
@@ -10112,7 +10112,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for fulltext set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare grant condition for sqlstate '02000';
@@ -10122,7 +10122,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for grant set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare group condition for sqlstate '02000';
@@ -10132,7 +10132,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for group set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare having condition for sqlstate '02000';
@@ -10142,7 +10142,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for having set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare high_priority condition for sqlstate '02000';
@@ -10152,7 +10152,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for high_prio' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_microsecond condition for sqlstate '02000';
@@ -10162,7 +10162,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for hour_m' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_minute condition for sqlstate '02000';
@@ -10172,7 +10172,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for hour_minute' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_second condition for sqlstate '02000';
@@ -10182,7 +10182,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for hour_second' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare if condition for sqlstate '02000';
@@ -10193,7 +10193,7 @@ declare exit handler for if set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare ignore condition for sqlstate '02000';
@@ -10203,7 +10203,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for ignore set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare in condition for sqlstate '02000';
@@ -10214,7 +10214,7 @@ declare exit handler for in set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare index condition for sqlstate '02000';
@@ -10224,7 +10224,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for index set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare infile condition for sqlstate '02000';
@@ -10234,7 +10234,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for infile set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare inner condition for sqlstate '02000';
@@ -10244,7 +10244,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for inner set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare inout condition for sqlstate '02000';
@@ -10254,7 +10254,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for inout set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare insensitive condition for sqlstate '02000';
@@ -10264,7 +10264,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for insensitive' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare insert condition for sqlstate '02000';
@@ -10274,7 +10274,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for insert set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int condition for sqlstate '02000';
@@ -10285,7 +10285,7 @@ declare exit handler for int set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int1 condition for sqlstate '02000';
@@ -10295,7 +10295,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int2 condition for sqlstate '02000';
@@ -10305,7 +10305,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int3 condition for sqlstate '02000';
@@ -10315,7 +10315,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int4 condition for sqlstate '02000';
@@ -10325,7 +10325,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int8 condition for sqlstate '02000';
@@ -10335,7 +10335,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1;' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare integer condition for sqlstate '02000';
@@ -10345,7 +10345,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for integer set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare interval condition for sqlstate '02000';
@@ -10355,7 +10355,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for interval set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare into condition for sqlstate '02000';
@@ -10365,7 +10365,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for into set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare is condition for sqlstate '02000';
@@ -10376,7 +10376,7 @@ declare exit handler for is set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare iterate condition for sqlstate '02000';
@@ -10386,7 +10386,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for iterate set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare join condition for sqlstate '02000';
@@ -10396,7 +10396,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for join set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare key condition for sqlstate '02000';
@@ -10407,7 +10407,7 @@ declare exit handler for key set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare keys condition for sqlstate '02000';
@@ -10417,7 +10417,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for keys set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare kill condition for sqlstate '02000';
@@ -10427,7 +10427,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for kill set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare leading condition for sqlstate '02000';
@@ -10437,7 +10437,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for leading set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare leave condition for sqlstate '02000';
@@ -10447,7 +10447,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for leave set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare left condition for sqlstate '02000';
@@ -10457,7 +10457,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for left set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare like condition for sqlstate '02000';
@@ -10467,7 +10467,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for like set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare limit condition for sqlstate '02000';
@@ -10477,7 +10477,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for limit set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare linear condition for sqlstate '02000';
@@ -10487,7 +10487,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare lines condition for sqlstate '02000';
@@ -10497,7 +10497,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for lines set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare load condition for sqlstate '02000';
@@ -10507,7 +10507,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for load set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare localtime condition for sqlstate '02000';
@@ -10517,7 +10517,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for localtime set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare localtimestamp condition for sqlstate '02000';
@@ -10527,7 +10527,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for localtim' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare lock condition for sqlstate '02000';
@@ -10537,7 +10537,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for lock set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare long condition for sqlstate '02000';
@@ -10547,7 +10547,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for long set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare longblob condition for sqlstate '02000';
@@ -10557,7 +10557,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for longblob set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare longtext condition for sqlstate '02000';
@@ -10567,7 +10567,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for longtext set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare loop condition for sqlstate '02000';
@@ -10577,7 +10577,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for loop set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare low_priority condition for sqlstate '02000';
@@ -10587,7 +10587,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for low_priori' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare master_ssl_verify_server_cert condition for sqlstate '02000';
@@ -10597,7 +10597,7 @@ ERROR 42000: You have an error in your S
 declare exit handl' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare match condition for sqlstate '02000';
@@ -10607,7 +10607,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for match set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumblob condition for sqlstate '02000';
@@ -10617,7 +10617,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for mediumblob s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumint condition for sqlstate '02000';
@@ -10627,7 +10627,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for mediumint set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumtext condition for sqlstate '02000';
@@ -10637,7 +10637,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for mediumtext s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare middleint condition for sqlstate '02000';
@@ -10647,7 +10647,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for middleint set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare minute_microsecond condition for sqlstate '02000';
@@ -10657,7 +10657,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for minu' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare minute_second condition for sqlstate '02000';
@@ -10667,7 +10667,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for minute_se' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mod condition for sqlstate '02000';
@@ -10678,7 +10678,7 @@ declare exit handler for mod set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare modifies condition for sqlstate '02000';
@@ -10688,7 +10688,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for modifies set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare natural condition for sqlstate '02000';
@@ -10698,7 +10698,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for natural set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare not condition for sqlstate '02000';
@@ -10709,7 +10709,7 @@ declare exit handler for not set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare no_write_to_binlog condition for sqlstate '02000';
@@ -10719,7 +10719,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for no_w' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare null condition for sqlstate '02000';
@@ -10729,7 +10729,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for null set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare numeric condition for sqlstate '02000';
@@ -10739,7 +10739,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for numeric set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare on condition for sqlstate '02000';
@@ -10750,7 +10750,7 @@ declare exit handler for on set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare optimize condition for sqlstate '02000';
@@ -10760,7 +10760,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for optimize set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare option condition for sqlstate '02000';
@@ -10770,7 +10770,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for option set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare optionally condition for sqlstate '02000';
@@ -10780,7 +10780,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for optionally s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare or condition for sqlstate '02000';
@@ -10791,7 +10791,7 @@ declare exit handler for or set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare order condition for sqlstate '02000';
@@ -10801,7 +10801,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for order set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare out condition for sqlstate '02000';
@@ -10812,7 +10812,7 @@ declare exit handler for out set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare outer condition for sqlstate '02000';
@@ -10822,7 +10822,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for outer set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare outfile condition for sqlstate '02000';
@@ -10832,7 +10832,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for outfile set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare precision condition for sqlstate '02000';
@@ -10842,7 +10842,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for precision set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare primary condition for sqlstate '02000';
@@ -10852,7 +10852,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for primary set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare procedure condition for sqlstate '02000';
@@ -10862,7 +10862,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for procedure set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare purge condition for sqlstate '02000';
@@ -10872,7 +10872,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for purge set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare range condition for sqlstate '02000';
@@ -10882,7 +10882,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read condition for sqlstate '02000';
@@ -10892,7 +10892,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for read set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare reads condition for sqlstate '02000';
@@ -10902,7 +10902,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for reads set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read_only condition for sqlstate '02000';
@@ -10912,7 +10912,7 @@ ERROR 42000: You have an error in your S
 END' at line 4
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read_write condition for sqlstate '02000';
@@ -10922,7 +10922,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare real condition for sqlstate '02000';
@@ -10932,7 +10932,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for real set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare references condition for sqlstate '02000';
@@ -10942,7 +10942,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for references s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare regexp condition for sqlstate '02000';
@@ -10952,7 +10952,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for regexp set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare release condition for sqlstate '02000';
@@ -10962,7 +10962,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for int set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare rename condition for sqlstate '02000';
@@ -10972,7 +10972,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for rename set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare repeat condition for sqlstate '02000';
@@ -10982,7 +10982,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for repeat set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare replace condition for sqlstate '02000';
@@ -10992,7 +10992,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for replace set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare require condition for sqlstate '02000';
@@ -11002,7 +11002,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for require set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare restrict condition for sqlstate '02000';
@@ -11012,7 +11012,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for restrict set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare return condition for sqlstate '02000';
@@ -11022,7 +11022,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for return set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare revoke condition for sqlstate '02000';
@@ -11032,7 +11032,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for revoke set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare right condition for sqlstate '02000';
@@ -11042,7 +11042,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for right set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare rlike condition for sqlstate '02000';
@@ -11052,7 +11052,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for rlike set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare schema condition for sqlstate '02000';
@@ -11062,7 +11062,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for schema set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare schemas condition for sqlstate '02000';
@@ -11072,7 +11072,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for schemas set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare second_microsecond condition for sqlstate '02000';
@@ -11082,7 +11082,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for seco' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare select condition for sqlstate '02000';
@@ -11092,7 +11092,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for SELECT set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sensitive condition for sqlstate '02000';
@@ -11102,7 +11102,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sensitive set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare separator condition for sqlstate '02000';
@@ -11112,7 +11112,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for separator set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare set condition for sqlstate '02000';
@@ -11123,7 +11123,7 @@ declare exit handler for set set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare show condition for sqlstate '02000';
@@ -11133,7 +11133,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for show set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare smallint condition for sqlstate '02000';
@@ -11143,7 +11143,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for smallint set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare spatial condition for sqlstate '02000';
@@ -11153,7 +11153,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for spatial set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare specific condition for sqlstate '02000';
@@ -11163,7 +11163,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for specific set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql condition for sqlstate '02000';
@@ -11174,7 +11174,7 @@ declare exit handler for sql set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlexception condition for sqlstate '02000';
@@ -11184,7 +11184,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sqlexcepti' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlstate condition for sqlstate '02000';
@@ -11194,7 +11194,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sqlstate set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlwarning condition for sqlstate '02000';
@@ -11204,7 +11204,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sqlwarning s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_big_result condition for sqlstate '02000';
@@ -11214,7 +11214,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sql_big_' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_calc_found_rows condition for sqlstate '02000';
@@ -11224,7 +11224,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sql' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_small_result condition for sqlstate '02000';
@@ -11234,7 +11234,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for sql_sm' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare ssl condition for sqlstate '02000';
@@ -11245,7 +11245,7 @@ declare exit handler for ssl set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare starting condition for sqlstate '02000';
@@ -11255,7 +11255,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for starting set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare straight_join condition for sqlstate '02000';
@@ -11265,7 +11265,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for straight_' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare table condition for sqlstate '02000';
@@ -11275,7 +11275,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for table set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare terminated condition for sqlstate '02000';
@@ -11285,7 +11285,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for terminated s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare then condition for sqlstate '02000';
@@ -11295,7 +11295,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for then set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinyblob condition for sqlstate '02000';
@@ -11305,7 +11305,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for tinyblob set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinyint condition for sqlstate '02000';
@@ -11315,7 +11315,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for tinyint set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinytext condition for sqlstate '02000';
@@ -11325,7 +11325,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for tinytext set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare to condition for sqlstate '02000';
@@ -11336,7 +11336,7 @@ declare exit handler for to set @var2 = 
 EN' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare trailing condition for sqlstate '02000';
@@ -11346,7 +11346,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for trailing set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare trigger condition for sqlstate '02000';
@@ -11356,7 +11356,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for trigger set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare true condition for sqlstate '02000';
@@ -11366,7 +11366,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for true set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare undo condition for sqlstate '02000';
@@ -11376,7 +11376,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for undo set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare union condition for sqlstate '02000';
@@ -11386,7 +11386,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for union set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unique condition for sqlstate '02000';
@@ -11396,7 +11396,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for unique set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unlock condition for sqlstate '02000';
@@ -11406,7 +11406,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for unlock set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unsigned condition for sqlstate '02000';
@@ -11416,7 +11416,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for unsigned set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare update condition for sqlstate '02000';
@@ -11426,7 +11426,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for update set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare usage condition for sqlstate '02000';
@@ -11436,7 +11436,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for usage set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare use condition for sqlstate '02000';
@@ -11447,7 +11447,7 @@ declare exit handler for USE set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare using condition for sqlstate '02000';
@@ -11457,7 +11457,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for using set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_date condition for sqlstate '02000';
@@ -11467,7 +11467,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for utc_date set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_time condition for sqlstate '02000';
@@ -11477,7 +11477,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for utc_time set @' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_timestamp condition for sqlstate '02000';
@@ -11487,7 +11487,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for utc_times' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare values condition for sqlstate '02000';
@@ -11497,7 +11497,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for values set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varbinary condition for sqlstate '02000';
@@ -11507,7 +11507,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for varbinary set' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varchar condition for sqlstate '02000';
@@ -11517,7 +11517,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for varchar set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varcharacter condition for sqlstate '02000';
@@ -11527,7 +11527,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for varcharact' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varying condition for sqlstate '02000';
@@ -11537,7 +11537,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for varying set @va' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare when condition for sqlstate '02000';
@@ -11547,7 +11547,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for when set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare where condition for sqlstate '02000';
@@ -11557,7 +11557,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for where set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare while condition for sqlstate '02000';
@@ -11567,7 +11567,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for while set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare with condition for sqlstate '02000';
@@ -11578,7 +11578,7 @@ declare exit handler for with set @var2 
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare write condition for sqlstate '02000';
@@ -11588,7 +11588,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for write set @var2 =' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare xor condition for sqlstate '02000';
@@ -11599,7 +11599,7 @@ declare exit handler for xor set @var2 =
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare year_month condition for sqlstate '02000';
@@ -11609,7 +11609,7 @@ ERROR 42000: You have an error in your S
 declare exit handler for year_month s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare zerofill condition for sqlstate '02000';
@@ -11625,7 +11625,7 @@ a stored procedure (continue- handler_ty
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare continue handler for sqlstate '23000' set @x2 = 1;
@@ -11639,7 +11639,7 @@ CALL sp1();
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS handler1;
 Warnings:
-Note	1305	PROCEDURE handler1 does not exist
+Note	1305	PROCEDURE db_storedproc.handler1 does not exist
 CREATE PROCEDURE handler1()
 BEGIN
 declare undo handler for sqlstate '23000' set @x2 = 1;
@@ -11654,7 +11654,7 @@ set @x = 1;
 insert into t values ' at line 3
 DROP PROCEDURE IF EXISTS handler1;
 Warnings:
-Note	1305	PROCEDURE handler1 does not exist
+Note	1305	PROCEDURE db_storedproc.handler1 does not exist
 CREATE PROCEDURE handler1()
 BEGIN
 declare continueinv handler for sqlstate '2300' set @x2 = 1;
@@ -11670,7 +11670,7 @@ insert into t values (1);
 s' at line 3
 DROP PROCEDURE IF EXISTS handler1;
 Warnings:
-Note	1305	PROCEDURE handler1 does not exist
+Note	1305	PROCEDURE db_storedproc.handler1 does not exist
 CREATE PROCEDURE handler1()
 BEGIN
 declare undoinv handler for sqlstate '2300' set @x2 = 1;
@@ -11686,7 +11686,7 @@ insert into t values (1);
 s' at line 3
 DROP PROCEDURE IF EXISTS handler1;
 Warnings:
-Note	1305	PROCEDURE handler1 does not exist
+Note	1305	PROCEDURE db_storedproc.handler1 does not exist
 CREATE PROCEDURE handler1 ()
 BEGIN
 declare exitinv handler for sqlstate '2300' set @x2 = 1;
@@ -11702,7 +11702,7 @@ insert into t values (1);
 s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare accessible handler for sqlstate '02000' set @var2 = 1;
@@ -11711,7 +11711,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare add handler for sqlstate '02000' set @var2 = 1;
@@ -11720,7 +11720,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare all handler for sqlstate '02000' set @var2 = 1;
@@ -11729,7 +11729,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare alter handler for sqlstate '02000' set @var2 = 1;
@@ -11738,7 +11738,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare analyze handler for sqlstate '02000' set @var2 = 1;
@@ -11747,7 +11747,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare and handler for sqlstate '02000' set @var2 = 1;
@@ -11756,7 +11756,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare as handler for sqlstate '02000' set @var2 = 1;
@@ -11765,7 +11765,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare asc handler for sqlstate '02000' set @var2 = 1;
@@ -11774,7 +11774,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare asensitive handler for sqlstate '02000' set @var2 = 1;
@@ -11783,7 +11783,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare before handler for sqlstate '02000' set @var2 = 1;
@@ -11792,7 +11792,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare between handler for sqlstate '02000' set @var2 = 1;
@@ -11801,7 +11801,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare bigint handler for sqlstate '02000' set @var2 = 1;
@@ -11810,7 +11810,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare binary handler for sqlstate '02000' set @var2 = 1;
@@ -11819,7 +11819,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare blob handler for sqlstate '02000' set @var2 = 1;
@@ -11828,7 +11828,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare both handler for sqlstate '02000' set @var2 = 1;
@@ -11837,7 +11837,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare by handler for sqlstate '02000' set @var2 = 1;
@@ -11846,7 +11846,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare call handler for sqlstate '02000' set @var2 = 1;
@@ -11855,7 +11855,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cascade handler for sqlstate '02000' set @var2 = 1;
@@ -11864,7 +11864,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare case handler for sqlstate '02000' set @var2 = 1;
@@ -11873,7 +11873,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare change handler for sqlstate '02000' set @var2 = 1;
@@ -11882,7 +11882,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare char handler for sqlstate '02000' set @var2 = 1;
@@ -11891,7 +11891,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare character handler for sqlstate '02000' set @var2 = 1;
@@ -11900,7 +11900,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare check handler for sqlstate '02000' set @var2 = 1;
@@ -11909,7 +11909,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare collate handler for sqlstate '02000' set @var2 = 1;
@@ -11918,7 +11918,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare column handler for sqlstate '02000' set @var2 = 1;
@@ -11927,7 +11927,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare condition handler for sqlstate '02000' set @var2 = 1;
@@ -11936,7 +11936,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare constraint handler for sqlstate '02000' set @var2 = 1;
@@ -11945,7 +11945,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare continue handler for sqlstate '02000' set @var2 = 1;
@@ -11959,7 +11959,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare create handler for sqlstate '02000' set @var2 = 1;
@@ -11968,7 +11968,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cross handler for sqlstate '02000' set @var2 = 1;
@@ -11977,7 +11977,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_date handler for sqlstate '02000' set @var2 = 1;
@@ -11986,7 +11986,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_time handler for sqlstate '02000' set @var2 = 1;
@@ -11995,7 +11995,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_timestamp handler for sqlstate '02000' set @var2 = 1;
@@ -12004,7 +12004,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare current_user handler for sqlstate '02000' set @var2 = 1;
@@ -12013,7 +12013,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare cursor handler for sqlstate '02000' set @var2 = 1;
@@ -12022,7 +12022,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare database handler for sqlstate '02000' set @var2 = 1;
@@ -12031,7 +12031,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare databases handler for sqlstate '02000' set @var2 = 1;
@@ -12040,7 +12040,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_hour handler for sqlstate '02000' set @var2 = 1;
@@ -12049,7 +12049,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -12058,7 +12058,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_minute handler for sqlstate '02000' set @var2 = 1;
@@ -12067,7 +12067,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare day_second handler for sqlstate '02000' set @var2 = 1;
@@ -12076,7 +12076,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare dec handler for sqlstate '02000' set @var2 = 1;
@@ -12085,7 +12085,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare decimal handler for sqlstate '02000' set @var2 = 1;
@@ -12094,7 +12094,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare declare handler for sqlstate '02000' set @var2 = 1;
@@ -12103,7 +12103,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare default handler for sqlstate '02000' set @var2 = 1;
@@ -12112,7 +12112,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare delayed handler for sqlstate '02000' set @var2 = 1;
@@ -12121,7 +12121,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare delete handler for sqlstate '02000' set @var2 = 1;
@@ -12130,7 +12130,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare desc handler for sqlstate '02000' set @var2 = 1;
@@ -12139,7 +12139,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare describe handler for sqlstate '02000' set @var2 = 1;
@@ -12148,7 +12148,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare deterministic handler for sqlstate '02000' set @var2 = 1;
@@ -12157,7 +12157,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare distinct handler for sqlstate '02000' set @var2 = 1;
@@ -12166,7 +12166,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare distinctrow handler for sqlstate '02000' set @var2 = 1;
@@ -12175,7 +12175,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare div handler for sqlstate '02000' set @var2 = 1;
@@ -12184,7 +12184,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare double handler for sqlstate '02000' set @var2 = 1;
@@ -12193,7 +12193,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare drop handler for sqlstate '02000' set @var2 = 1;
@@ -12202,7 +12202,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare dual handler for sqlstate '02000' set @var2 = 1;
@@ -12211,7 +12211,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare each handler for sqlstate '02000' set @var2 = 1;
@@ -12220,7 +12220,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare else handler for sqlstate '02000' set @var2 = 1;
@@ -12229,7 +12229,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare elseif handler for sqlstate '02000' set @var2 = 1;
@@ -12238,7 +12238,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare enclosed handler for sqlstate '02000' set @var2 = 1;
@@ -12247,7 +12247,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare escaped handler for sqlstate '02000' set @var2 = 1;
@@ -12256,7 +12256,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare exists handler for sqlstate '02000' set @var2 = 1;
@@ -12265,7 +12265,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare exit handler for sqlstate '02000' set @var2 = 1;
@@ -12279,7 +12279,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare false handler for sqlstate '02000' set @var2 = 1;
@@ -12288,7 +12288,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare fetch handler for sqlstate '02000' set @var2 = 1;
@@ -12297,7 +12297,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float handler for sqlstate '02000' set @var2 = 1;
@@ -12306,7 +12306,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float4 handler for sqlstate '02000' set @var2 = 1;
@@ -12315,7 +12315,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare float8 handler for sqlstate '02000' set @var2 = 1;
@@ -12324,7 +12324,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare for handler for sqlstate '02000' set @var2 = 1;
@@ -12333,7 +12333,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare force handler for sqlstate '02000' set @var2 = 1;
@@ -12342,7 +12342,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare foreign handler for sqlstate '02000' set @var2 = 1;
@@ -12351,7 +12351,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare from handler for sqlstate '02000' set @var2 = 1;
@@ -12360,7 +12360,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare fulltext handler for sqlstate '02000' set @var2 = 1;
@@ -12369,7 +12369,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare grant handler for sqlstate '02000' set @var2 = 1;
@@ -12378,7 +12378,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare group handler for sqlstate '02000' set @var2 = 1;
@@ -12387,7 +12387,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare having handler for sqlstate '02000' set @var2 = 1;
@@ -12396,7 +12396,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare high_priority handler for sqlstate '02000' set @var2 = 1;
@@ -12405,7 +12405,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -12414,7 +12414,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_minute handler for sqlstate '02000' set @var2 = 1;
@@ -12423,7 +12423,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare hour_second handler for sqlstate '02000' set @var2 = 1;
@@ -12432,7 +12432,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare if handler for sqlstate '02000' set @var2 = 1;
@@ -12441,7 +12441,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare ignore handler for sqlstate '02000' set @var2 = 1;
@@ -12450,7 +12450,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare in handler for sqlstate '02000' set @var2 = 1;
@@ -12459,7 +12459,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare index handler for sqlstate '02000' set @var2 = 1;
@@ -12468,7 +12468,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare infile handler for sqlstate '02000' set @var2 = 1;
@@ -12477,7 +12477,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare inner handler for sqlstate '02000' set @var2 = 1;
@@ -12486,7 +12486,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare inout handler for sqlstate '02000' set @var2 = 1;
@@ -12495,7 +12495,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare insensitive handler for sqlstate '02000' set @var2 = 1;
@@ -12504,7 +12504,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare insert handler for sqlstate '02000' set @var2 = 1;
@@ -12513,7 +12513,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int handler for sqlstate '02000' set @var2 = 1;
@@ -12522,7 +12522,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int1 handler for sqlstate '02000' set @var2 = 1;
@@ -12531,7 +12531,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int2 handler for sqlstate '02000' set @var2 = 1;
@@ -12540,7 +12540,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int3 handler for sqlstate '02000' set @var2 = 1;
@@ -12549,7 +12549,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int4 handler for sqlstate '02000' set @var2 = 1;
@@ -12558,7 +12558,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare int8 handler for sqlstate '02000' set @var2 = 1;
@@ -12567,7 +12567,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare integer handler for sqlstate '02000' set @var2 = 1;
@@ -12576,7 +12576,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare interval handler for sqlstate '02000' set @var2 = 1;
@@ -12585,7 +12585,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare into handler for sqlstate '02000' set @var2 = 1;
@@ -12594,7 +12594,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare is handler for sqlstate '02000' set @var2 = 1;
@@ -12603,7 +12603,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare iterate handler for sqlstate '02000' set @var2 = 1;
@@ -12612,7 +12612,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare join handler for sqlstate '02000' set @var2 = 1;
@@ -12621,7 +12621,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare key handler for sqlstate '02000' set @var2 = 1;
@@ -12630,7 +12630,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare keys handler for sqlstate '02000' set @var2 = 1;
@@ -12639,7 +12639,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare kill handler for sqlstate '02000' set @var2 = 1;
@@ -12648,7 +12648,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare leading handler for sqlstate '02000' set @var2 = 1;
@@ -12657,7 +12657,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare leave handler for sqlstate '02000' set @var2 = 1;
@@ -12666,7 +12666,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare left handler for sqlstate '02000' set @var2 = 1;
@@ -12675,7 +12675,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare like handler for sqlstate '02000' set @var2 = 1;
@@ -12684,7 +12684,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare limit handler for sqlstate '02000' set @var2 = 1;
@@ -12693,7 +12693,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare linear handler for sqlstate '02000' set @var2 = 1;
@@ -12702,7 +12702,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare lines handler for sqlstate '02000' set @var2 = 1;
@@ -12711,7 +12711,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare load handler for sqlstate '02000' set @var2 = 1;
@@ -12720,7 +12720,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare localtime handler for sqlstate '02000' set @var2 = 1;
@@ -12729,7 +12729,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare localtimestamp handler for sqlstate '02000' set @var2 = 1;
@@ -12738,7 +12738,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare lock handler for sqlstate '02000' set @var2 = 1;
@@ -12747,7 +12747,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare long handler for sqlstate '02000' set @var2 = 1;
@@ -12756,7 +12756,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare longblob handler for sqlstate '02000' set @var2 = 1;
@@ -12765,7 +12765,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare longtext handler for sqlstate '02000' set @var2 = 1;
@@ -12774,7 +12774,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare loop handler for sqlstate '02000' set @var2 = 1;
@@ -12783,7 +12783,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare low_priority handler for sqlstate '02000' set @var2 = 1;
@@ -12792,7 +12792,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1;
@@ -12801,7 +12801,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare match handler for sqlstate '02000' set @var2 = 1;
@@ -12810,7 +12810,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumblob handler for sqlstate '02000' set @var2 = 1;
@@ -12819,7 +12819,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumint handler for sqlstate '02000' set @var2 = 1;
@@ -12828,7 +12828,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mediumtext handler for sqlstate '02000' set @var2 = 1;
@@ -12837,7 +12837,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare middleint handler for sqlstate '02000' set @var2 = 1;
@@ -12846,7 +12846,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare minute_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -12855,7 +12855,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare minute_second handler for sqlstate '02000' set @var2 = 1;
@@ -12864,7 +12864,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare mod handler for sqlstate '02000' set @var2 = 1;
@@ -12873,7 +12873,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare modifies handler for sqlstate '02000' set @var2 = 1;
@@ -12882,7 +12882,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare natural handler for sqlstate '02000' set @var2 = 1;
@@ -12891,7 +12891,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare not handler for sqlstate '02000' set @var2 = 1;
@@ -12900,7 +12900,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare no_write_to_binlog handler for sqlstate '02000' set @var2 = 1;
@@ -12909,7 +12909,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare null handler for sqlstate '02000' set @var2 = 1;
@@ -12918,7 +12918,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare numeric handler for sqlstate '02000' set @var2 = 1;
@@ -12927,7 +12927,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare on handler for sqlstate '02000' set @var2 = 1;
@@ -12936,7 +12936,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare optimize handler for sqlstate '02000' set @var2 = 1;
@@ -12945,7 +12945,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare option handler for sqlstate '02000' set @var2 = 1;
@@ -12954,7 +12954,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare optionally handler for sqlstate '02000' set @var2 = 1;
@@ -12963,7 +12963,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare or handler for sqlstate '02000' set @var2 = 1;
@@ -12972,7 +12972,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare order handler for sqlstate '02000' set @var2 = 1;
@@ -12981,7 +12981,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare out handler for sqlstate '02000' set @var2 = 1;
@@ -12990,7 +12990,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare outer handler for sqlstate '02000' set @var2 = 1;
@@ -12999,7 +12999,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare outfile handler for sqlstate '02000' set @var2 = 1;
@@ -13008,7 +13008,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare precision handler for sqlstate '02000' set @var2 = 1;
@@ -13017,7 +13017,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare primary handler for sqlstate '02000' set @var2 = 1;
@@ -13026,7 +13026,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare privileges handler for sqlstate '02000' set @var2 = 1;
@@ -13035,7 +13035,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare procedure handler for sqlstate '02000' set @var2 = 1;
@@ -13044,7 +13044,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare purge handler for sqlstate '02000' set @var2 = 1;
@@ -13053,7 +13053,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare range handler for sqlstate '02000' set @var2 = 1;
@@ -13062,7 +13062,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read handler for sqlstate '02000' set @var2 = 1;
@@ -13071,7 +13071,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare reads handler for sqlstate '02000' set @var2 = 1;
@@ -13080,7 +13080,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read_only handler for sqlstate '02000' set @var2 = 1;
@@ -13089,7 +13089,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare read_write handler for sqlstate '02000' set @var2 = 1;
@@ -13098,7 +13098,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare real handler for sqlstate '02000' set @var2 = 1;
@@ -13107,7 +13107,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare references handler for sqlstate '02000' set @var2 = 1;
@@ -13116,7 +13116,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare regexp handler for sqlstate '02000' set @var2 = 1;
@@ -13125,7 +13125,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare release handler for sqlstate '02000' set @var2 = 1;
@@ -13134,7 +13134,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare rename handler for sqlstate '02000' set @var2 = 1;
@@ -13143,7 +13143,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare repeat handler for sqlstate '02000' set @var2 = 1;
@@ -13152,7 +13152,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare replace handler for sqlstate '02000' set @var2 = 1;
@@ -13161,7 +13161,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare require handler for sqlstate '02000' set @var2 = 1;
@@ -13170,7 +13170,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare restrict handler for sqlstate '02000' set @var2 = 1;
@@ -13179,7 +13179,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare return handler for sqlstate '02000' set @var2 = 1;
@@ -13188,7 +13188,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare revoke handler for sqlstate '02000' set @var2 = 1;
@@ -13197,7 +13197,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare right handler for sqlstate '02000' set @var2 = 1;
@@ -13206,7 +13206,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare rlike handler for sqlstate '02000' set @var2 = 1;
@@ -13215,7 +13215,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare schema handler for sqlstate '02000' set @var2 = 1;
@@ -13224,7 +13224,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare schemas handler for sqlstate '02000' set @var2 = 1;
@@ -13233,7 +13233,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare second_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -13242,7 +13242,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare select handler for sqlstate '02000' set @var2 = 1;
@@ -13251,7 +13251,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sensitive handler for sqlstate '02000' set @var2 = 1;
@@ -13260,7 +13260,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare separator handler for sqlstate '02000' set @var2 = 1;
@@ -13269,7 +13269,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare set handler for sqlstate '02000' set @var2 = 1;
@@ -13278,7 +13278,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare show handler for sqlstate '02000' set @var2 = 1;
@@ -13287,7 +13287,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare smallint handler for sqlstate '02000' set @var2 = 1;
@@ -13296,7 +13296,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare spatial handler for sqlstate '02000' set @var2 = 1;
@@ -13305,7 +13305,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare specific handler for sqlstate '02000' set @var2 = 1;
@@ -13314,7 +13314,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql handler for sqlstate '02000' set @var2 = 1;
@@ -13323,7 +13323,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlexception handler for sqlstate '02000' set @var2 = 1;
@@ -13332,7 +13332,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlstate handler for sqlstate '02000' set @var2 = 1;
@@ -13341,7 +13341,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sqlwarning handler for sqlstate '02000' set @var2 = 1;
@@ -13350,7 +13350,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_big_result handler for sqlstate '02000' set @var2 = 1;
@@ -13359,7 +13359,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_calc_found_rows handler for sqlstate '02000' set @var2 = 1;
@@ -13368,7 +13368,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare sql_small_result handler for sqlstate '02000' set @var2 = 1;
@@ -13377,7 +13377,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare ssl handler for sqlstate '02000' set @var2 = 1;
@@ -13386,7 +13386,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare starting handler for sqlstate '02000' set @var2 = 1;
@@ -13395,7 +13395,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare straight_join handler for sqlstate '02000' set @var2 = 1;
@@ -13404,7 +13404,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare table handler for sqlstate '02000' set @var2 = 1;
@@ -13413,7 +13413,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare terminated handler for sqlstate '02000' set @var2 = 1;
@@ -13422,7 +13422,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare then handler for sqlstate '02000' set @var2 = 1;
@@ -13431,7 +13431,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinyblob handler for sqlstate '02000' set @var2 = 1;
@@ -13440,7 +13440,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinyint handler for sqlstate '02000' set @var2 = 1;
@@ -13449,7 +13449,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare tinytext handler for sqlstate '02000' set @var2 = 1;
@@ -13458,7 +13458,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare to handler for sqlstate '02000' set @var2 = 1;
@@ -13467,7 +13467,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare trailing handler for sqlstate '02000' set @var2 = 1;
@@ -13476,7 +13476,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare trigger handler for sqlstate '02000' set @var2 = 1;
@@ -13485,7 +13485,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare true handler for sqlstate '02000' set @var2 = 1;
@@ -13494,7 +13494,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare undo handler for sqlstate '02000' set @var2 = 1;
@@ -13503,7 +13503,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare union handler for sqlstate '02000' set @var2 = 1;
@@ -13512,7 +13512,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unique handler for sqlstate '02000' set @var2 = 1;
@@ -13521,7 +13521,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unlock handler for sqlstate '02000' set @var2 = 1;
@@ -13530,7 +13530,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare unsigned handler for sqlstate '02000' set @var2 = 1;
@@ -13539,7 +13539,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare update handler for sqlstate '02000' set @var2 = 1;
@@ -13548,7 +13548,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare usage handler for sqlstate '02000' set @var2 = 1;
@@ -13557,7 +13557,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare use handler for sqlstate '02000' set @var2 = 1;
@@ -13566,7 +13566,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare using handler for sqlstate '02000' set @var2 = 1;
@@ -13575,7 +13575,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_date handler for sqlstate '02000' set @var2 = 1;
@@ -13584,7 +13584,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_time handler for sqlstate '02000' set @var2 = 1;
@@ -13593,7 +13593,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare utc_timestamp handler for sqlstate '02000' set @var2 = 1;
@@ -13602,7 +13602,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare values handler for sqlstate '02000' set @var2 = 1;
@@ -13611,7 +13611,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varbinary handler for sqlstate '02000' set @var2 = 1;
@@ -13620,7 +13620,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varchar handler for sqlstate '02000' set @var2 = 1;
@@ -13629,7 +13629,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varcharacter handler for sqlstate '02000' set @var2 = 1;
@@ -13638,7 +13638,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare varying handler for sqlstate '02000' set @var2 = 1;
@@ -13647,7 +13647,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare when handler for sqlstate '02000' set @var2 = 1;
@@ -13656,7 +13656,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare where handler for sqlstate '02000' set @var2 = 1;
@@ -13665,7 +13665,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare while handler for sqlstate '02000' set @var2 = 1;
@@ -13674,7 +13674,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare with handler for sqlstate '02000' set @var2 = 1;
@@ -13683,7 +13683,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare write handler for sqlstate '02000' set @var2 = 1;
@@ -13692,7 +13692,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare xor handler for sqlstate '02000' set @var2 = 1;
@@ -13701,7 +13701,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare year_month handler for sqlstate '02000' set @var2 = 1;
@@ -13710,7 +13710,7 @@ ERROR 42000: You have an error in your S
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare zerofill handler for sqlstate '02000' set @var2 = 1;
@@ -13765,7 +13765,7 @@ SET @x = 0;
 SET @y = 0;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 SET @start_global_value = @@GLOBAL.sort_buffer_size;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13813,7 +13813,7 @@ Testcase 4.2.30:
 set @xx=0;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx int;
@@ -13844,7 +13844,7 @@ Testcase 4.2.31 - a:
 set @xx=0;
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx char;
@@ -13863,7 +13863,7 @@ Testcase 4.2.31 - b:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx float;
@@ -13891,7 +13891,7 @@ Testcase 4.2.31 - c:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx datetime;
@@ -13919,7 +13919,7 @@ Testcase 4.2.31 - d:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx varchar(20);
@@ -13935,7 +13935,7 @@ Testcase 4.2.31 - e:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare xx tinyint;
@@ -13963,7 +13963,7 @@ Testcase 4.2.37:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x integer; declare y integer;
@@ -14365,7 +14365,7 @@ Testcase 4.2.38:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare notable condition for sqlstate '42S02';
@@ -14383,7 +14383,7 @@ Testcase 4.2.39:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare cond1 condition for sqlstate '42000';
@@ -14397,7 +14397,7 @@ Testcase 4.2.41:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare cond1 condition for sqlstate '1';
@@ -14536,7 +14536,7 @@ END//
 ERROR 42000: Duplicate handler declared in the same block
 DROP PROCEDURE IF EXISTS handler1;
 Warnings:
-Note	1305	PROCEDURE handler1 does not exist
+Note	1305	PROCEDURE db_storedproc.handler1 does not exist
 CREATE PROCEDURE handler1 ()
 BEGIN
 declare mycondition condition for sqlstate '23000';
@@ -14742,7 +14742,7 @@ Testcase 4.2.57:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -14772,7 +14772,7 @@ Testcase 4.2.59:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -14827,7 +14827,7 @@ Testcase 4.2.60:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -14877,7 +14877,7 @@ Testcase 4.2.62:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -14944,7 +14944,7 @@ Testcase 4.2.63:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:

-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
 declare done int default 0;
@@ -14993,7 +14993,7 @@ Testcase 4.2.64:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -15019,7 +15019,7 @@ Testcase 4.2.65:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -15045,7 +15045,7 @@ Testcase 4.2.66:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -15075,7 +15075,7 @@ Testcase 4.2.67:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -15105,7 +15105,7 @@ create table temp1( f1 char(20), f2 char
 create table temp2( f1 char(20), f2 char(20), f3 int, f4 char(20) );
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
-Note	1305	PROCEDURE sp1 does not exist
+Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
@@ -22636,7 +22636,7 @@ Testcase 4.9.6:
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
 SELECT * from t9 limit 0, 100;
@@ -22645,7 +22645,7 @@ END//
 ERROR 0A000: Not allowed to return a result set from a function
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 drop table IF EXISTS res_t9;
 Warnings:
 Note	1051	Unknown table 'res_t9'
@@ -22660,7 +22660,7 @@ END//
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 drop table IF EXISTS res_t9;
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
@@ -22671,7 +22671,7 @@ END//
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 drop  table IF EXISTS res_t9;
 Warnings:
 Note	1051	Unknown table 'res_t9'
@@ -22685,7 +22685,7 @@ END//
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 drop  table IF EXISTS res_t9;
 create table res_t9 (f1 int, f2 char(25), f3 int);
 insert into res_t9 values (10, 'abc', 20);
@@ -22699,7 +22699,7 @@ ERROR HY000: Explicit or implicit commit
 drop table res_t9;
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
-Note	1305	FUNCTION fn1 does not exist
+Note	1305	FUNCTION db_storedproc.fn1 does not exist
 
 Testcase 4.9.7:
 --------------------------------------------------------------------------------

=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2010-02-20 10:07:32 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2010-02-24 00:45:49 +0000
@@ -787,6 +787,7 @@ f1	f2	f3
 222222	bbbbbb	2
 drop table t1;
 Illegal ndb error code: 1186
+MySQL error code 1186 (ER_FLUSH_MASTER_BINLOG_CLOSED): Binlog closed, cannot RESET MASTER
 CREATE TABLE t1 (
 a VARBINARY(40) NOT NULL,
 b VARCHAR (256) CHARACTER SET UTF8 NOT NULL,

=== renamed file 'mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result' => 'mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result'
--- a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result	2009-03-06 18:19:29 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result	2010-02-16 19:34:34 +0000
@@ -1,8 +1,4 @@
-SET @old_relay_log_purge= @@global.relay_log_purge;
-change master to
-MASTER_HOST='dummy.localdomain',
-RELAY_LOG_FILE='slave-relay-bin.000001',
-RELAY_LOG_POS=4;
+Setting up fake replication from MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
 start slave sql_thread;
 select MASTER_POS_WAIT('master-bin.000001', 3776);
 # Result on slave
@@ -38,5 +34,4 @@ DROP PROCEDURE IF EXISTS p2;
 DROP FUNCTION IF EXISTS f1;
 DROP TRIGGER IF EXISTS tr1;
 stop slave sql_thread;
-reset slave;
-SET @@global.relay_log_purge= @old_relay_log_purge;
+Cleaning up after setup_fake_relay_log.inc

=== renamed file 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt' => 'mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt'
=== renamed file 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test' => 'mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test'
--- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2009-10-02 08:40:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test	2010-02-16 19:34:34 +0000
@@ -17,35 +17,8 @@
 
 source include/have_log_bin.inc;
 
-# Need to restore this at the end; CHANGE MASTER modifies it (see the
-# manual for CHANGE MASTER).
-SET @old_relay_log_purge= @@global.relay_log_purge;
-
-let $MYSQLD_DATADIR= `select @@datadir`;
-
-copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001;
-
-
-# After patch for BUG#12190, the filename used in CHANGE MASTER
-# RELAY_LOG_FILE will be automatically added the directory of the
-# relay log before comparison, thus we need to added the directory
-# part (./ on unix .\ on windows) when faking the relay-log-bin.index.
-disable_query_log;
-if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
-{
-  eval select './slave-relay-bin.000001\n' into dumpfile '$MYSQLD_DATADIR/slave-relay-bin.index';
-}
-
-if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`)
-{
-  eval select '.\\\\slave-relay-bin.000001\n' into dumpfile '$MYSQLD_DATADIR/slave-relay-bin.index';
-}
-enable_query_log;
-
-change master to
-  MASTER_HOST='dummy.localdomain',
-  RELAY_LOG_FILE='slave-relay-bin.000001',
-  RELAY_LOG_POS=4;
+let $fake_relay_log= $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001;
+source include/setup_fake_relay_log.inc;
 
 start slave sql_thread;
 disable_result_log;
@@ -66,9 +39,4 @@ DROP TRIGGER IF EXISTS tr1;
 enable_warnings;
 
 stop slave sql_thread;
-reset slave;
-source include/wait_for_slave_sql_to_stop.inc;
-remove_file $MYSQLD_DATADIR/slave-relay-bin.000001;
-remove_file $MYSQLD_DATADIR/slave-relay-bin.index;
-
-SET @@global.relay_log_purge= @old_relay_log_purge;
+source include/cleanup_fake_relay_log.inc;

=== modified file 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2009-11-27 23:34:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2010-02-17 09:18:17 +0000
@@ -161,14 +161,14 @@ connection master;
 remove_file $MYSQLTEST_VARDIR/tmp/master.sql;
 
 
-# this test for position option
+# this test for start-position option
 # By setting this position to 416, we should only get the create of t3
 --disable_query_log
 select "--- Test 2 position test --" as "";
 --enable_query_log
 let $MYSQLD_DATADIR= `select @@datadir;`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=417 --stop-position=570 $MYSQLD_DATADIR/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --start-position=417 --stop-position=570 $MYSQLD_DATADIR/master-bin.000001
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -266,7 +266,7 @@ let $MYSQLD_DATADIR= `select @@datadir;`
 select "--- Test 7 reading stdin w/position --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --position=417 --stop-position=570 - < $MYSQLD_DATADIR/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --start-position=417 --stop-position=570 - < $MYSQLD_DATADIR/master-bin.000001
        
 # Bug#16217 (mysql client did not know how not switch its internal charset)
 --disable_query_log

=== modified file 'mysql-test/suite/sys_vars/r/lc_time_names_basic.result'
--- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result	2010-02-18 17:10:39 +0000
@@ -460,7 +460,7 @@ SELECT @@session.lc_time_names;
 sq_AL
 SET @@session.lc_time_names=sr_YU;
 Warnings:
-Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
+Warning	1287	'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
 SELECT @@session.lc_time_names;
 @@session.lc_time_names
 sr_RS
@@ -907,7 +907,7 @@ SELECT @@global.lc_time_names;
 sq_AL
 SET @@global.lc_time_names=sr_YU;
 Warnings:
-Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
+Warning	1287	'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
 SELECT @@global.lc_time_names;
 @@global.lc_time_names
 sr_RS

=== modified file 'mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result'
--- a/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result	2008-12-19 15:12:15 +0000
+++ b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result	2010-02-23 18:43:26 +0000
@@ -66,7 +66,7 @@ SET GLOBAL max_prepared_stmt_count=3;
 ** Creating procedure **
 DROP PROCEDURE  IF EXISTS  sp_checkstmts;
 Warnings:
-Note	1305	PROCEDURE sp_checkstmts does not exist
+Note	1305	PROCEDURE test.sp_checkstmts does not exist
 CREATE PROCEDURE sp_checkstmts ()
 BEGIN
 PREPARE newstmt from "SELECT * FROM information_schema.CHARACTER_SETS C";

=== removed file 'mysql-test/suite/sys_vars/r/sql_log_update_basic.result'
--- a/mysql-test/suite/sys_vars/r/sql_log_update_basic.result	2010-02-09 14:06:04 +0000
+++ b/mysql-test/suite/sys_vars/r/sql_log_update_basic.result	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-SET @start_global_value = @@global.sql_log_update;
-SELECT @start_global_value;
-@start_global_value
-1
-select @@global.sql_log_update;
-@@global.sql_log_update
-1
-select @@session.sql_log_update;
-@@session.sql_log_update
-1
-show global variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	ON
-show session variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	ON
-select * from information_schema.global_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	ON
-select * from information_schema.session_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	ON
-set global sql_log_update=1;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
-set session sql_log_update=ON;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
-select @@global.sql_log_update;
-@@global.sql_log_update
-1
-select @@session.sql_log_update;
-@@session.sql_log_update
-1
-show global variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	ON
-show session variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	ON
-select * from information_schema.global_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	ON
-select * from information_schema.session_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	ON
-set global sql_log_update=0;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
-set session sql_log_update=OFF;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
-select @@global.sql_log_update;
-@@global.sql_log_update
-0
-select @@session.sql_log_update;
-@@session.sql_log_update
-0
-show global variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	OFF
-show session variables like 'sql_log_update';
-Variable_name	Value
-sql_log_update	OFF
-select * from information_schema.global_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	OFF
-select * from information_schema.session_variables where variable_name='sql_log_update';
-VARIABLE_NAME	VARIABLE_VALUE
-SQL_LOG_UPDATE	OFF
-set global sql_log_update=1.1;
-ERROR 42000: Incorrect argument type to variable 'sql_log_update'
-set global sql_log_update=1e1;
-ERROR 42000: Incorrect argument type to variable 'sql_log_update'
-set global sql_log_update="foo";
-ERROR 42000: Variable 'sql_log_update' can't be set to the value of 'foo'
-SET @@global.sql_log_update = @start_global_value;
-Warnings:
-Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored. This option will be removed in MySQL 5.6.
-SELECT @@global.sql_log_update;
-@@global.sql_log_update
-1

=== removed file 'mysql-test/suite/sys_vars/t/sql_log_update_basic.test'
--- a/mysql-test/suite/sys_vars/t/sql_log_update_basic.test	2010-01-29 06:33:00 +0000
+++ b/mysql-test/suite/sys_vars/t/sql_log_update_basic.test	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-
-#
-# 2010-01-20 OBN - Added check of I_S tables after variable value changes.
-#                - Added value change to ON/OFF to ensure change of current value
-#
-
---source include/have_profiling.inc
-
-SET @start_global_value = @@global.sql_log_update;
-SELECT @start_global_value;
-
-#
-# exists as global and session
-#
-select @@global.sql_log_update;
-select @@session.sql_log_update;
-show global variables like 'sql_log_update';
-show session variables like 'sql_log_update';
-select * from information_schema.global_variables where variable_name='sql_log_update';
-select * from information_schema.session_variables where variable_name='sql_log_update';
-
-#
-# show that it's writable
-#
-set global sql_log_update=1;
-set session sql_log_update=ON;
-select @@global.sql_log_update;
-select @@session.sql_log_update;
-show global variables like 'sql_log_update';
-show session variables like 'sql_log_update';
-select * from information_schema.global_variables where variable_name='sql_log_update';
-select * from information_schema.session_variables where variable_name='sql_log_update';
-set global sql_log_update=0;
-set session sql_log_update=OFF;
-select @@global.sql_log_update;
-select @@session.sql_log_update;
-show global variables like 'sql_log_update';
-show session variables like 'sql_log_update';
-select * from information_schema.global_variables where variable_name='sql_log_update';
-select * from information_schema.session_variables where variable_name='sql_log_update';
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global sql_log_update=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global sql_log_update=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global sql_log_update="foo";
-
-SET @@global.sql_log_update = @start_global_value;
-SELECT @@global.sql_log_update;

=== modified file 'mysql-test/t/bug47671-master.opt'
--- a/mysql-test/t/bug47671-master.opt	2009-11-25 06:55:49 +0000
+++ b/mysql-test/t/bug47671-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---default-character-set=utf8 --skip-character-set-client-handshake
+--character-set-server=utf8 --skip-character-set-client-handshake

=== modified file 'mysql-test/t/ctype_latin1_de-master.opt'
--- a/mysql-test/t/ctype_latin1_de-master.opt	2003-05-21 23:57:27 +0000
+++ b/mysql-test/t/ctype_latin1_de-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---default-character-set=latin1 --default-collation=latin1_german2_ci
+--character-set-server=latin1 --collation-server=latin1_german2_ci

=== modified file 'mysql-test/t/ctype_ucs2_def-master.opt'
--- a/mysql-test/t/ctype_ucs2_def-master.opt	2007-02-19 11:04:38 +0000
+++ b/mysql-test/t/ctype_ucs2_def-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1
+--collation-server=ucs2_unicode_ci --character-set-server=ucs2,latin1

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2009-11-03 22:29:16 +0000
+++ b/mysql-test/t/func_time.test	2010-02-17 09:18:17 +0000
@@ -345,10 +345,6 @@ select date_add(date,INTERVAL "1" QUARTE
 select timestampadd(MINUTE, 1, date) from t1;
 select timestampadd(WEEK, 1, date) from t1;
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
---enable_ps_protocol
 
 select timestampdiff(MONTH, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(YEAR, '2002-05-01', '2001-01-01') as a;
@@ -360,10 +356,6 @@ select timestampdiff(SQL_TSI_HOUR, '2001
 select timestampdiff(SQL_TSI_DAY, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(SQL_TSI_MINUTE, '2001-02-01 12:59:59', '2001-05-01 12:58:59') as a;
 select timestampdiff(SQL_TSI_SECOND, '2001-02-01 12:59:59', '2001-05-01 12:58:58') as a;
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
---enable_ps_protocol
 
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
        timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
@@ -602,9 +594,6 @@ select isnull(week(now() + 0)), isnull(w
 
 --echo End of 4.1 tests
 
-explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
-			timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
-
 #
 # Bug #10590: %h, %I, and %l format specifies should all return results in
 # the 0-11 range
@@ -797,27 +786,11 @@ select DATE_ADD(20071108,         INTERV
 
 select LAST_DAY('2007-12-06 08:59:19.05') - INTERVAL 1 SECOND;
 
-#
 # Bug#33834: FRAC_SECOND: Applicability not clear in documentation
 #
-# Show that he use of FRAC_SECOND, for anything other than
-# TIMESTAMPADD / TIMESTAMPDIFF, is a server error.
-
-# mysqltest.c discards an expected 'deprecated' warning on prepare stage
---disable_ps_protocol
-SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
-SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
---enable_ps_protocol
-
---error ER_PARSE_ERROR
-SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);
---error ER_PARSE_ERROR
-SELECT DATE_SUB('2008-02-18', INTERVAL 1 FRAC_SECOND);
-
---error ER_PARSE_ERROR
-SELECT '2008-02-18' + INTERVAL 1 FRAC_SECOND;
---error ER_PARSE_ERROR
-SELECT '2008-02-18' - INTERVAL 1 FRAC_SECOND;
+# Test case removed since FRAC_SECOND was deprecated and
+# removed as part of WL#5154
+#
 
 #
 # Bug #36466:

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2009-12-11 09:39:38 +0000
+++ b/mysql-test/t/innodb_mysql.test	2010-02-17 10:24:53 +0000
@@ -555,3 +555,42 @@ create table t2 (fk int, key x (fk),
                  constraint x foreign key (FK) references t1 (PK)) engine=InnoDB;
 show create table t2;
 drop table t2, t1;
+
+
+--echo #
+--echo # Bug#44613 SELECT statement inside FUNCTION takes a shared lock
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP FUNCTION IF EXISTS f1;
+--enable_warnings
+
+CREATE TABLE t1(x INT PRIMARY KEY, y INT) ENGINE=innodb;
+INSERT INTO t1 VALUES (1, 0), (2, 0);
+
+CREATE FUNCTION f1(z INT) RETURNS INT READS SQL DATA
+  RETURN (SELECT x FROM t1 WHERE x = z);
+
+--echo # Connection default
+START TRANSACTION;
+SELECT f1(1);
+
+--echo # Connection con2
+--disable_query_log
+connect (con2, localhost, root);
+--enable_query_log
+START TRANSACTION;
+SELECT f1(1);
+# This next statement used to block.
+UPDATE t1 SET y = 1 WHERE x = 1;
+
+COMMIT;
+
+disconnect con2;
+--source include/wait_until_disconnected.inc
+--echo # Connection default
+connection default;
+COMMIT;
+DROP TABLE t1;
+DROP FUNCTION f1;

=== modified file 'mysql-test/t/mysqlbinlog.test'
--- a/mysql-test/t/mysqlbinlog.test	2010-01-20 20:22:43 +0000
+++ b/mysql-test/t/mysqlbinlog.test	2010-02-17 09:18:17 +0000
@@ -65,13 +65,13 @@ select "--- --database --" as "";
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLD_DATADIR/master-bin.000001 2> /dev/null
 
-# this test for position option
+# this test for start-position option
 --disable_query_log
-select "--- --position --" as "";
+select "--- --start-position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=1074 $MYSQLD_DATADIR/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --start-position=1074 $MYSQLD_DATADIR/master-bin.000002
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -103,11 +103,11 @@ select "--- --database --" as "";
 
 # Strangely but this works
 --disable_query_log
-select "--- --position --" as "";
+select "--- --start-position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=1074 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --start-position=1074 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
 
 
 # Bug#7853 mysqlbinlog does not accept input from stdin
@@ -120,7 +120,7 @@ select "--- reading stdin --" as "";
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

 --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
---exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
+--exec $MYSQL_BINLOG --short-form --start-position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
 drop table t1,t2;
 
 #

=== modified file 'mysql-test/t/perror.test'
--- a/mysql-test/t/perror.test	2006-08-01 09:29:10 +0000
+++ b/mysql-test/t/perror.test	2010-02-24 07:22:19 +0000
@@ -1,3 +1,4 @@
+--source include/not_windows.inc
 #
 # Check if the variable MY_PERROR is set
 #
@@ -17,3 +18,17 @@ enable_query_log;
 # As there is no error code defined for 10000, expect error
 --error 1
 --exec $MY_PERROR 10000 2>&1
+
+#
+# Bug#10143 (Perror not showing error description)
+#
+
+# test reported case
+--exec $MY_PERROR 1062 2>&1
+
+# test errors that contain characters to escape in the text.
+--exec $MY_PERROR 1076 2>&1
+--exec $MY_PERROR 1459 2>&1
+--exec $MY_PERROR 1461 2>&1
+
+

=== modified file 'mysql-test/t/ps-master.opt'
--- a/mysql-test/t/ps-master.opt	2009-08-27 13:17:09 +0000
+++ b/mysql-test/t/ps-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-output=table,file --log-slow-queries --log-queries-not-using-indexes

=== modified file 'mysql-test/t/show_check-master.opt'
--- a/mysql-test/t/show_check-master.opt	2009-08-27 13:17:09 +0000
+++ b/mysql-test/t/show_check-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
+--log-output=table,file --log-slow-queries --log-queries-not-using-indexes --myisam-recover=""

=== modified file 'mysql-test/t/udf.test'
--- a/mysql-test/t/udf.test	2009-12-01 21:25:51 +0000
+++ b/mysql-test/t/udf.test	2010-02-23 18:43:26 +0000
@@ -436,6 +436,75 @@ SELECT * FROM t2 WHERE a = sequence();
 DROP FUNCTION sequence;
 DROP TABLE t1,t2;
 
+#
+# Bug#31767 (DROP FUNCTION name resolution)
+#
+
+--disable_warnings
+drop function if exists test.metaphon;
+drop function if exists metaphon;
+--enable_warnings
+
+--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
+eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_LIB";
+
+select metaphon("Hello");
+
+# The UDF should not be dropped
+drop function if exists test.metaphon;
+
+select metaphon("Hello");
+
+drop function metaphon;
+
+CREATE FUNCTION test.metaphon(a TEXT) RETURNS TEXT return "This is a SF";
+
+create database db_31767;
+use db_31767;
+
+--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
+eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_LIB";
+
+use test;
+
+# Uses the UDF
+select metaphon("Hello");
+
+# Uses the SF
+select test.metaphon("Hello");
+
+# Should drop the UDF, resolving the name the same way select does.
+drop function metaphon;
+
+# Should call the SF
+select metaphon("Hello");
+
+# Drop the SF
+drop function metaphon;
+
+# Change the current database to none.
+use db_31767;
+drop database db_31767;
+
+drop function if exists no_such_func;
+
+--error ER_SP_DOES_NOT_EXIST
+drop function no_such_func;
+
+drop function if exists test.no_such_func;
+
+--error ER_SP_DOES_NOT_EXIST
+drop function test.no_such_func;
+
+--error ER_NO_DB_ERROR
+drop procedure if exists no_such_proc;
+
+--error ER_NO_DB_ERROR
+drop procedure no_such_proc;
+
+use test;
+
+
 --echo #
 --echo # Bug#46259: 5.0.83 -> 5.1.36, query doesn't work
 --echo #

=== modified file 'mysql-test/t/union-master.opt'
--- a/mysql-test/t/union-master.opt	2003-12-06 22:21:09 +0000
+++ b/mysql-test/t/union-master.opt	2010-02-17 09:18:17 +0000
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-slow-queries --log-queries-not-using-indexes

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2010-02-15 12:11:20 +0000
+++ b/mysql-test/t/variables.test	2010-02-20 09:40:21 +0000
@@ -346,7 +346,6 @@ set sql_big_tables=1;
 set sql_buffer_result=1;
 set sql_log_bin=1;
 set sql_log_off=1;
-set sql_log_update=1;
 set sql_low_priority_updates=1;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;

=== modified file 'mysql-test/t/view.test'
--- a/mysql-test/t/view.test	2009-12-16 08:33:54 +0000
+++ b/mysql-test/t/view.test	2010-02-18 13:54:38 +0000
@@ -6,6 +6,9 @@ drop database if exists mysqltest;
 --enable_warnings
 use test;
 
+# Save the initial number of concurrent sessions.
+--source include/count_sessions.inc
+
 #
 # some basic test of views and its functionality
 #
@@ -3975,3 +3978,79 @@ CREATE VIEW t2 AS SELECT * FROM t1;
 
 UNLOCK TABLES;
 DROP TABLE t1, t2;
+
+
+--echo #
+--echo # Bug#48315 Metadata lock is not taken for merged views that
+--echo #           use an INFORMATION_SCHEMA table
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP VIEW IF EXISTS v1;
+DROP PROCEDURE IF EXISTS p1;
+--enable_warnings
+
+connect (con2, localhost, root);
+connect (con3, localhost, root);
+
+--echo # Connection default
+connection default;
+
+CREATE VIEW v1 AS SELECT schema_name FROM information_schema.schemata;
+CREATE TABLE t1 (str VARCHAR(50));
+CREATE PROCEDURE p1() INSERT INTO t1 SELECT * FROM v1;
+
+--echo # CALL p1() so the view is merged.
+CALL p1();
+
+--echo # Connection 3
+connection con3;
+LOCK TABLE t1 READ;
+
+--echo # Connection default
+connection default;
+--echo # Try to CALL p1() again, this time it should block for t1.
+--echo # Sending:
+--send CALL p1()
+
+--echo # Connection 2
+connection con2;
+let $wait_condition=
+  SELECT COUNT(*) = 1 from information_schema.processlist
+  WHERE state = "Table lock" AND info = "INSERT INTO t1 SELECT * FROM v1";
+--source include/wait_condition.inc
+--echo # ... then try to drop the view. This should block.
+--echo # Sending:
+--send DROP VIEW v1
+
+--echo # Connection 3
+connection con3;
+let $wait_condition=
+  SELECT COUNT(*) = 1 from information_schema.processlist
+  WHERE state = "Waiting for table" AND info = "DROP VIEW v1";
+--source include/wait_condition.inc
+--echo # Now allow CALL p1() to complete
+UNLOCK TABLES;
+
+--echo # Connection default
+connection default;
+--echo # Reaping: CALL p1()
+--reap
+
+--echo # Connection 2
+connection con2;
+--echo # Reaping: DROP VIEW v1
+--reap
+
+--echo # Connection default
+connection default;
+DROP PROCEDURE p1;
+DROP TABLE t1;
+disconnect con2;
+disconnect con3;
+
+
+# Check that all connections opened by test cases in this file are really
+# gone so execution of other tests won't be affected by their presence.
+--source include/wait_until_count_sessions.inc

=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt	2009-12-19 02:21:49 +0000
+++ b/mysys/CMakeLists.txt	2010-02-22 19:55:27 +0000
@@ -42,7 +42,7 @@ IF (WIN32)
  SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_winthread.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_conio.c)
 ENDIF()
 
-IF(CMAKE_COMPILER_IS_GNUCC AND  NOT HAVE_CXX_NEW)
+IF(NOT HAVE_CXX_NEW)
  # gcc as C++ compiler  does not have new/delete
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc)
  ADD_DEFINITIONS( -DUSE_MYSYS_NEW)

=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-02-19 17:30:08 +0000
+++ b/scripts/CMakeLists.txt	2010-02-23 12:50:45 +0000
@@ -66,6 +66,7 @@ INSTALL(FILES 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
+  ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR}
 )
 

=== modified file 'scripts/mysqld_multi.sh'
--- a/scripts/mysqld_multi.sh	2010-01-30 18:58:23 +0000
+++ b/scripts/mysqld_multi.sh	2010-02-17 09:18:17 +0000
@@ -59,18 +59,6 @@ sub main
     push @defaults_options, (shift @ARGV);
   }
 
-  # Handle deprecated --config-file option: convert to --defaults-extra-file
-  foreach my $arg (@ARGV)
-  {
-    if ($arg =~ m/^--config-file=(.*)/)
-    {
-      # Put it at the beginning of the list, so it has lower precedence
-      # than a correct --defaults-extra-file option
-
-      unshift @defaults_options, "--defaults-extra-file=$1";
-    }
-  }
-
   foreach (@defaults_options)
   {
     $_ = quote_shell_word($_);
@@ -79,11 +67,6 @@ sub main
   # Add [mysqld_multi] options to front of @ARGV, ready for GetOptions()
   unshift @ARGV, defaults_for_group('mysqld_multi');
 
-  # The --config-file option can be ignored; if passed on the command
-  # line, it's already handled; if specified in the configuration file,
-  # it's redundant and not useful
-  @ARGV= grep { not /^--config-file=/ } @ARGV;
-
   # We've already handled --no-defaults, --defaults-file, etc.
   if (!GetOptions("help", "example", "version", "mysqld=s", "mysqladmin=s",
                   "user=s", "password=s", "log=s", "no-log",
@@ -740,8 +723,8 @@ from both [mysqld_multi] and [mysqld#], 
 used, $my_progname will abort with an error.
 
 $my_progname will search for groups named [mysqld#] from my.cnf (or
-the given --config-file=...), where '#' can be any positive integer
-starting from 1. These groups should be the same as the regular
+the given --defaults-extra-file=...), where '#' can be any positive 
+integer starting from 1. These groups should be the same as the regular
 [mysqld] group, but with those port, socket and any other options
 that are to be used with each separate mysqld process. The number
 in the group name has another function; it can be used for starting,
@@ -767,7 +750,6 @@ These options must be given before any o
                    standard system-wide and user-specific files
 Using:  @{[join ' ', @defaults_options]}
 
---config-file=...  Deprecated, please use --defaults-extra-file instead
 --example          Give an example of a config file with extra information.
 --help             Print this help and exit.
 --log=...          Log file. Full path to and the name for the log file. NOTE:

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-02-20 19:40:03 +0000
+++ b/sql/CMakeLists.txt	2010-02-24 19:19:24 +0000
@@ -191,7 +191,14 @@ ADD_CUSTOM_COMMAND(
   COMMAND ${CMAKE_COMMAND} -E remove -f lex_hash.h.tmp
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_lex_hash.cc)
-        
+
+MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
+SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
+TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
+  mysys dbug strings vio regex   
+  ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
+  ${SSL_LIBRARIES})
+
 ADD_CUSTOM_TARGET( 
         GenServerSource
         DEPENDS ${GEN_SOURCES}

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2010-01-19 16:36:14 +0000
+++ b/sql/item_cmpfunc.cc	2010-02-23 11:48:26 +0000
@@ -2865,9 +2865,7 @@ bool Item_func_case::fix_fields(THD *thd
     buff should match stack usage from
     Item_func_case::val_int() -> Item_func_case::find_item()
   */
-#ifndef EMBEDDED_LIBRARY
   uchar buff[MAX_FIELD_WIDTH*2+sizeof(String)*2+sizeof(String*)*2+sizeof(double)*2+sizeof(longlong)*2];
-#endif
   bool res= Item_func::fix_fields(thd, ref);
   /*
     Call check_stack_overrun after fix_fields to be sure that stack variable
@@ -4081,9 +4079,7 @@ Item_cond::fix_fields(THD *thd, Item **r
   DBUG_ASSERT(fixed == 0);
   List_iterator<Item> li(list);
   Item *item;
-#ifndef EMBEDDED_LIBRARY
   uchar buff[sizeof(char*)];			// Max local vars in function
-#endif
   not_null_tables_cache= used_tables_cache= 0;
   const_item_cache= 1;
   /*

=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2010-02-06 10:28:06 +0000
+++ b/sql/item_func.cc	2010-02-23 11:48:26 +0000
@@ -151,9 +151,7 @@ Item_func::fix_fields(THD *thd, Item **r
 {
   DBUG_ASSERT(fixed == 0);
   Item **arg,**arg_end;
-#ifndef EMBEDDED_LIBRARY			// Avoid compiler warning
   uchar buff[STACK_BUFF_ALLOC];			// Max argument in function
-#endif
 
   used_tables_cache= not_null_tables_cache= 0;
   const_item_cache=1;
@@ -2839,9 +2837,7 @@ bool
 udf_handler::fix_fields(THD *thd, Item_result_field *func,
 			uint arg_count, Item **arguments)
 {
-#ifndef EMBEDDED_LIBRARY			// Avoid compiler warning
   uchar buff[STACK_BUFF_ALLOC];			// Max argument in function
-#endif
   DBUG_ENTER("Item_udf_func::fix_fields");
 
   if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))

=== modified file 'sql/lex.h'
--- a/sql/lex.h	2010-02-04 22:08:08 +0000
+++ b/sql/lex.h	2010-02-20 09:40:21 +0000
@@ -226,7 +226,6 @@ static SYMBOL symbols[] = {
   { "FORCE",		SYM(FORCE_SYM)},
   { "FOREIGN",		SYM(FOREIGN)},
   { "FOUND",            SYM(FOUND_SYM)},
-  { "FRAC_SECOND",      SYM(FRAC_SECOND_SYM)},
   { "FROM",		SYM(FROM)},
   { "FULL",		SYM(FULL)},
   { "FULLTEXT",		SYM(FULLTEXT_SYM)},
@@ -517,7 +516,6 @@ static SYMBOL symbols[] = {
   { "SQL_NO_CACHE",	SYM(SQL_NO_CACHE_SYM)},
   { "SQL_SMALL_RESULT", SYM(SQL_SMALL_RESULT)},
   { "SQL_THREAD",	SYM(SQL_THREAD)},
-  { "SQL_TSI_FRAC_SECOND", SYM(FRAC_SECOND_SYM)},
   { "SQL_TSI_SECOND",   SYM(SECOND_SYM)},
   { "SQL_TSI_MINUTE",   SYM(MINUTE_SYM)},
   { "SQL_TSI_HOUR",     SYM(HOUR_SYM)},

=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2010-02-20 10:07:32 +0000
+++ b/sql/mysql_priv.h	2010-02-23 12:50:45 +0000
@@ -198,12 +198,12 @@ char* query_table_status(THD *thd,const 
     if (((THD *) Thd) != NULL)                                              \
       push_warning_printf(((THD *) Thd), MYSQL_ERROR::WARN_LEVEL_WARN,      \
                         ER_WARN_DEPRECATED_SYNTAX,                          \
-                        ER(ER_WARN_DEPRECATED_SYNTAX_WITH_VER),             \
-                        (Old), #VerHi "." #VerLo, (New));                   \
+                        ER(ER_WARN_DEPRECATED_SYNTAX),                      \
+                        (Old), (New));                                      \
     else                                                                    \
       sql_print_warning("The syntax '%s' is deprecated and will be removed " \
-                        "in MySQL %s. Please use %s instead.",              \
-                        (Old), #VerHi "." #VerLo, (New));                   \
+                        "in a future release. Please use %s instead.",      \
+                        (Old), (New));                                      \
   } while(0)
 
 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info;
@@ -2027,7 +2027,7 @@ extern bool in_bootstrap;
 extern uint volatile thread_count, global_read_lock;
 extern uint connection_count;
 extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;
-extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;
+extern my_bool opt_local_infile, opt_myisam_use_mmap;
 extern my_bool opt_slave_compressed_protocol, use_temp_pool;
 extern uint slave_exec_mode_options;
 extern ulonglong slave_type_conversions_options;
@@ -2534,14 +2534,14 @@ inline bool is_user_table(TABLE * table)
 #ifndef EMBEDDED_LIBRARY
 extern "C" void unireg_abort(int exit_code) __attribute__((noreturn));
 void kill_delayed_threads(void);
-bool check_stack_overrun(THD *thd, long margin, uchar *dummy);
 #else
 extern "C" void unireg_clear(int exit_code);
 #define unireg_abort(exit_code) do { unireg_clear(exit_code); DBUG_RETURN(exit_code); } while(0)
 inline void kill_delayed_threads(void) {}
-#define check_stack_overrun(A, B, C) 0
 #endif
 
+bool check_stack_overrun(THD *thd, long margin, uchar *dummy);
+
 /* This must match the path length limit in the ER_NOT_RW_DIR error msg. */
 #define ER_NOT_RW_DIR_PATHSIZE 200
 bool is_usable_directory(THD *thd, const char *varname,
@@ -2639,7 +2639,6 @@ enum options_mysqld
   OPT_BOOTSTRAP,
   OPT_CONSOLE,
   OPT_DEBUG_SYNC_TIMEOUT,
-  OPT_DELAY_KEY_WRITE_ALL,
   OPT_ISAM_LOG,
   OPT_KEY_BUFFER_SIZE,
   OPT_KEY_CACHE_AGE_THRESHOLD,
@@ -2658,19 +2657,16 @@ enum options_mysqld
   OPT_SAFE,
   OPT_SERVER_ID,
   OPT_SKIP_HOST_CACHE,
-  OPT_SKIP_LOCK,
   OPT_SKIP_NEW,
   OPT_SKIP_PRIOR,
   OPT_SKIP_RESOLVE,
   OPT_SKIP_STACK_TRACE,
-  OPT_SKIP_SYMLINKS,
   OPT_SLOW_QUERY_LOG,
   OPT_SSL_CA,
   OPT_SSL_CAPATH,
   OPT_SSL_CERT,
   OPT_SSL_CIPHER,
   OPT_SSL_KEY,
-  OPT_UPDATE_LOG,
   OPT_WANT_CORE,
   OPT_ENGINE_CONDITION_PUSHDOWN
 };

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-02-16 22:19:47 +0000
+++ b/sql/mysqld.cc	2010-02-22 13:22:31 +0000
@@ -52,6 +52,10 @@
 #include "sp_rcontext.h"
 #include "sp_cache.h"
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
 #define mysqld_charset &my_charset_latin1
 
 /* stack traces are only supported on linux intel */
@@ -4011,21 +4015,13 @@ static int init_server_components()
       Implementation of the above :
       - If mysqld is started with --log-update and --log-bin,
       ignore --log-update (print a warning), push a warning when SQL_LOG_UPDATE
-      is used, and turn off --sql-bin-update-same.
+      is used,
       This will completely ignore SQL_LOG_UPDATE
       - If mysqld is started with --log-update only,
       change it to --log-bin (with the filename passed to log-update,
       plus '-bin') (print a warning), push a warning when SQL_LOG_UPDATE is
-      used, and turn on --sql-bin-update-same.
+      used.
       This will translate SQL_LOG_UPDATE to SQL_LOG_BIN.
-
-      Note that we tell the user that --sql-bin-update-same is deprecated and
-      does nothing, and we don't take into account if he used this option or
-      not; but internally we give this variable a value to have the behaviour
-      we want (i.e. have SQL_LOG_UPDATE influence SQL_LOG_BIN or not).
-      As sql-bin-update-same, log-update and log-bin cannot be changed by the
-      user after starting the server (they are not variables), the user will
-      not later interfere with the settings we do here.
     */
     if (opt_bin_log)
     {
@@ -5351,26 +5347,47 @@ void handle_connections_sockets()
 {
   my_socket sock,new_sock;
   uint error_count=0;
-  uint max_used_connection= (uint) (max(ip_sock,unix_sock)+1);
-  fd_set readFDs,clientFDs;
   THD *thd;
   struct sockaddr_storage cAddr;
-  int ip_flags=0,socket_flags=0,flags;
+  int ip_flags=0,socket_flags=0,flags,retval;
   st_vio *vio_tmp;
+#ifdef HAVE_POLL
+  int socket_count= 0;
+  struct pollfd fds[2]; // for ip_sock and unix_sock
+#else
+  fd_set readFDs,clientFDs;
+  uint max_used_connection= (uint) (max(ip_sock,unix_sock)+1);
+#endif
+
   DBUG_ENTER("handle_connections_sockets");
 
   LINT_INIT(new_sock);
 
+#ifndef HAVE_POLL
   FD_ZERO(&clientFDs);
+#endif
+
   if (ip_sock != INVALID_SOCKET)
   {
+#ifdef HAVE_POLL
+    fds[socket_count].fd= ip_sock;
+    fds[socket_count].events= POLLIN;
+    socket_count++;
+#else
     FD_SET(ip_sock,&clientFDs);
+#endif    
 #ifdef HAVE_FCNTL
     ip_flags = fcntl(ip_sock, F_GETFL, 0);
 #endif
   }
 #ifdef HAVE_SYS_UN_H
+#ifdef HAVE_POLL
+  fds[socket_count].fd= unix_sock;
+  fds[socket_count].events= POLLIN;
+  socket_count++;
+#else
   FD_SET(unix_sock,&clientFDs);
+#endif
 #ifdef HAVE_FCNTL
   socket_flags=fcntl(unix_sock, F_GETFL, 0);
 #endif
@@ -5380,12 +5397,15 @@ void handle_connections_sockets()
   MAYBE_BROKEN_SYSCALL;
   while (!abort_loop)
   {
-    readFDs=clientFDs;
-#ifdef HPUX10
-    if (select(max_used_connection,(int*) &readFDs,0,0,0) < 0)
-      continue;
+#ifdef HAVE_POLL
+    retval= poll(fds, socket_count, -1);
 #else
-    if (select((int) max_used_connection,&readFDs,0,0,0) < 0)
+    readFDs=clientFDs;
+
+    retval= select((int) max_used_connection,&readFDs,0,0,0);
+#endif
+
+    if (retval < 0)
     {
       if (socket_errno != SOCKET_EINTR)
       {
@@ -5395,7 +5415,7 @@ void handle_connections_sockets()
       MAYBE_BROKEN_SYSCALL
       continue;
     }
-#endif	/* HPUX10 */
+
     if (abort_loop)
     {
       MAYBE_BROKEN_SYSCALL;
@@ -5403,6 +5423,21 @@ void handle_connections_sockets()
     }
 
     /* Is this a new connection request ? */
+#ifdef HAVE_POLL
+    for (int i= 0; i < socket_count; ++i) 
+    {
+      if (fds[i].revents & POLLIN)
+      {
+        sock= fds[i].fd;
+#ifdef HAVE_FCNTL
+        flags= fcntl(sock, F_GETFL, 0);
+#else
+        flags= 0;
+#endif // HAVE_FCNTL
+        break;
+      }
+    }
+#else  // HAVE_POLL
 #ifdef HAVE_SYS_UN_H
     if (FD_ISSET(unix_sock,&readFDs))
     {
@@ -5410,11 +5445,12 @@ void handle_connections_sockets()
       flags= socket_flags;
     }
     else
-#endif
+#endif // HAVE_SYS_UN_H
     {
       sock = ip_sock;
       flags= ip_flags;
     }
+#endif // HAVE_POLL
 
 #if !defined(NO_FCNTL_NONBLOCK)
     if (!(test_flags & TEST_BLOCKING))
@@ -5978,12 +6014,6 @@ struct my_option my_long_options[]=
    0, 0, 0},
   {"core-file", OPT_WANT_CORE, "Write core on errors.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"default-character-set", 'C', "Set the default character set (deprecated option, use --character-set-server instead).",
-   (uchar**) &default_character_set_name, (uchar**) &default_character_set_name,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-  {"default-collation", 0, "Set the default collation (deprecated option, use --collation-server instead).",
-   (uchar**) &default_collation_name, (uchar**) &default_collation_name,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   /* default-storage-engine should have "MyISAM" as def_value. Instead
      of initializing it here it is done in init_common_variables() due
      to a compiler bug in Sun Studio compiler. */
@@ -5993,9 +6023,6 @@ struct my_option my_long_options[]=
   {"default-time-zone", 0, "Set the default time zone.",
    (uchar**) &default_tz_name, (uchar**) &default_tz_name,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-  {"delay-key-write-for-all-tables", OPT_DELAY_KEY_WRITE_ALL,
-   "Don't flush key buffers between writes for any MyISAM table (Deprecated option, use --delay-key-write=all instead).",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_OPENSSL
   {"des-key-file", 0,
    "Load keys for des_encrypt() and des_encrypt from given file.",
@@ -6009,10 +6036,6 @@ struct my_option my_long_options[]=
    (uchar**) &disconnect_slave_event_count, 0, GET_INT, REQUIRED_ARG, 0, 0, 0,
    0, 0, 0},
 #endif /* HAVE_REPLICATION */
-  {"enable-locking", 0,
-   "Deprecated option, use --external-locking instead.",
-   (uchar**) &opt_external_locking, (uchar**) &opt_external_locking,
-   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_STACK_TRACE_ON_SEGV
   {"enable-pstack", 0, "Print a symbolic stack trace on failure.",
    (uchar**) &opt_do_pstack, (uchar**) &opt_do_pstack, 0, GET_BOOL, NO_ARG, 0, 0,
@@ -6065,9 +6088,6 @@ struct my_option my_long_options[]=
   {"log-isam", OPT_ISAM_LOG, "Log all MyISAM changes to file.",
    (uchar**) &myisam_log_filename, (uchar**) &myisam_log_filename, 0, GET_STR,
    OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"log-long-format", '0',
-   "Log some extra information to update log. Please note that this option is deprecated; see --log-short-format option.", 
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"log-short-format", 0,
    "Don't log extra information to update and slow-query logs.",
    (uchar**) &opt_short_log_format, (uchar**) &opt_short_log_format,
@@ -6100,11 +6120,6 @@ struct my_option my_long_options[]=
    REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ULONG_MAX, 0,
    TC_LOG_PAGE_SIZE, 0},
 #endif
-  {"log-update", OPT_UPDATE_LOG,
-   "The update log is deprecated since version 5.0, is replaced by the binary \
-log and this option justs turns on --log-bin instead.",
-   (uchar**) &opt_update_logname, (uchar**) &opt_update_logname, 0, GET_STR,
-   OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"master-info-file", 0,
    "The location and name of the file that remembers the master and where the I/O replication \
 thread is in the master's binlogs.",
@@ -6168,11 +6183,6 @@ Can't be set to 1 if --log-slave-updates
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing).",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef TO_BE_DELETED
-  {"safe-show-database", 0,
-   "Deprecated option; use GRANT SHOW DATABASES instead...",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"safe-user-create", 0,
    "Don't allow new user creation by the user who has no write privileges to the mysql.user table.",
    (uchar**) &opt_safe_user_create, (uchar**) &opt_safe_user_create, 0, GET_BOOL,
@@ -6185,9 +6195,6 @@ Can't be set to 1 if --log-slave-updates
    (uchar**)&sf_malloc_mem_limit, (uchar**)&sf_malloc_mem_limit, 0, GET_UINT,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
-  {"set-variable", 'O',
-   "Change the value of a variable. Please note that this option is deprecated;you can set variables directly with --variable-name=value.",
-   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"show-slave-auth-info", 0,
    "Show user and password in SHOW SLAVE HOSTS on this master",
    (uchar**) &opt_show_slave_auth_info, (uchar**) &opt_show_slave_auth_info, 0,
@@ -6200,9 +6207,6 @@ Can't be set to 1 if --log-slave-updates
 #endif
   {"skip-host-cache", OPT_SKIP_HOST_CACHE, "Don't cache host names.", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"skip-locking", OPT_SKIP_LOCK,
-   "Deprecated option, use --skip-external-locking instead.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-name-resolve", OPT_SKIP_RESOLVE,
    "Don't resolve hostnames. All hostnames are IP's or 'localhost'.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -6214,8 +6218,6 @@ Can't be set to 1 if --log-slave-updates
   {"skip-stack-trace", OPT_SKIP_STACK_TRACE,
    "Don't print a stack trace on failure.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
    0, 0, 0, 0},
-  {"skip-symlink", OPT_SKIP_SYMLINKS, "Don't allow symlinking of tables. Deprecated option.  Use --skip-symbolic-links instead.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-thread-priority", OPT_SKIP_PRIOR,
    "Don't give threads different priorities. This option is deprecated "
    "because it has no effect; the implied behavior is already the default.",
@@ -6227,10 +6229,6 @@ Can't be set to 1 if --log-slave-updates
    (uchar**) &opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
    0},
 #endif /* HAVE_REPLICATION */
-  {"sql-bin-update-same", 0,
-   "The update log is deprecated since version 5.0, is replaced by the "
-   "binary log and this option does nothing anymore.",
-   0, 0, 0, GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_OPENSSL
   {"ssl", 0,
    "Enable SSL for connection (automatically enabled with other flags).",
@@ -6289,20 +6287,12 @@ Can't be set to 1 if --log-slave-updates
    0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"warnings", 'W', "Deprecated; use --log-warnings instead.",
-   (uchar**) &global_system_variables.log_warnings,
-   (uchar**) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG,
-   1, 0, ULONG_MAX, 0, 0, 0},
   {"plugin-load", 0,
    "Optional semicolon-separated list of plugins to load, where each plugin is "
    "identified as name=library, where name is the plugin name and library "
    "is the plugin library in plugin_dir.",
    (uchar**) &opt_plugin_load, (uchar**) &opt_plugin_load, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"record_buffer", 0, "Deprecated; use --read-buffer-size instead.",
-   (uchar**) &global_system_variables.read_buff_size,
-   (uchar**) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG,
-   128*1024L, IO_SIZE*2, INT_MAX32, 0, IO_SIZE, 0},
   {"table_cache", 0, "Deprecated; use --table-open-cache instead.",
    (uchar**) &table_cache_size, (uchar**) &table_cache_size, 0, GET_ULONG,
    REQUIRED_ARG, TABLE_OPEN_CACHE_DEFAULT, 1, 512*1024L, 0, 1, 0},
@@ -7216,9 +7206,6 @@ mysqld_get_one_option(int optid,
   case (int) OPT_ISAM_LOG:
     opt_myisam_log=1;
     break;
-  case (int) OPT_UPDATE_LOG:
-    opt_update_log=1;
-    break;
   case (int) OPT_BIN_LOG:
     opt_bin_log= test(argument != disabled_my_option);
     break;
@@ -7339,9 +7326,6 @@ mysqld_get_one_option(int optid,
                       "and will be removed in MySQL 7.0. This option has no effect "
                       "as the implied behavior is already the default.");
     break;
-  case (int) OPT_SKIP_LOCK:
-    opt_external_locking=0;
-    break;
   case (int) OPT_SKIP_HOST_CACHE:
     opt_specialflag|= SPECIAL_NO_HOST_CACHE;
     break;
@@ -7354,9 +7338,6 @@ mysqld_get_one_option(int optid,
   case (int) OPT_SKIP_STACK_TRACE:
     test_flags|=TEST_NO_STACKTRACE;
     break;
-  case (int) OPT_SKIP_SYMLINKS:
-    my_use_symdir=0;
-    break;
   case (int) OPT_BIND_ADDRESS:
     {
       struct addrinfo *res_lst, hints;    
@@ -7389,12 +7370,6 @@ mysqld_get_one_option(int optid,
   case OPT_SERVER_ID:
     server_id_supplied = 1;
     break;
-  case OPT_DELAY_KEY_WRITE_ALL:
-    if (argument != disabled_my_option)
-      delay_key_write_options= DELAY_KEY_WRITE_ALL;
-    else
-      delay_key_write_options= DELAY_KEY_WRITE_NONE;
-    break;
   case OPT_ONE_THREAD:
     thread_handling= SCHEDULER_ONE_THREAD_PER_CONNECTION;
     break;

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2010-02-12 09:41:15 +0000
+++ b/sql/opt_range.cc	2010-02-23 11:48:26 +0000
@@ -2266,9 +2266,7 @@ int SQL_SELECT::test_quick_select(THD *t
   keys_to_use.intersect(head->keys_in_use_for_query);
   if (!keys_to_use.is_clear_all())
   {
-#ifndef EMBEDDED_LIBRARY                      // Avoid compiler warning
     uchar buff[STACK_BUFF_ALLOC];
-#endif
     MEM_ROOT alloc;
     SEL_TREE *tree= NULL;
     KEY_PART *key_parts;

=== modified file 'sql/share/CMakeLists.txt'
--- a/sql/share/CMakeLists.txt	2010-01-24 15:23:16 +0000
+++ b/sql/share/CMakeLists.txt	2010-02-24 19:19:24 +0000
@@ -47,6 +47,8 @@ FOREACH (dir ${dirs})
  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} 
   DESTINATION  ${INSTALL_MYSQLSHAREDIR})
 ENDFOREACH()
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
+  PATTERN "languages.html" EXCLUDE
+)
 
 INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR})

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2010-02-20 10:07:32 +0000
+++ b/sql/share/errmsg-utf8.txt	2010-02-21 19:36:05 +0000
@@ -5018,10 +5018,8 @@ ER_UNKNOWN_STORAGE_ENGINE 42000 
         ger "Unbekannte Speicher-Engine '%s'"
         por "Motor de tabela desconhecido '%s'"
         spa "Desconocido motor de tabla '%s'"
-# When using this error code, use ER(ER_WARN_DEPRECATED_SYNTAX_WITH_VER)
-# for the message string.  See, for example, code in mysql_priv.h.
 ER_WARN_DEPRECATED_SYNTAX  
-        eng "'%s' is deprecated; use '%s' instead"
+        eng "'%s' is deprecated and will be removed in a future release. Please use %s instead"
         ger "'%s' ist veraltet. Bitte benutzen Sie '%s'"
         por "'%s' é desatualizado. Use '%s' em seu lugar"
         spa "'%s' está desaprobado, use '%s' en su lugar"

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2010-02-15 11:16:49 +0000
+++ b/sql/slave.cc	2010-02-22 00:27:46 +0000
@@ -1602,7 +1602,7 @@ static void write_ignored_events_info_to
                    " to the relay log, SHOW SLAVE STATUS may be"
                    " inaccurate");
       rli->relay_log.harvest_bytes_written(&rli->log_space_total);
-      if (flush_master_info(mi, TRUE, FALSE))
+      if (flush_master_info(mi, TRUE, TRUE))
         sql_print_error("Failed to flush master info file");
       delete ev;
     }

=== modified file 'sql/spatial.cc'
--- a/sql/spatial.cc	2009-12-22 16:23:13 +0000
+++ b/sql/spatial.cc	2010-02-17 10:19:17 +0000
@@ -1612,9 +1612,8 @@ int Gis_multi_polygon::area(double *ar, 
 int Gis_multi_polygon::centroid(String *result) const
 {
   uint32 n_polygons;
-  bool first_loop= 1;
   Gis_polygon p;
-  double UNINIT_VAR(res_area), UNINIT_VAR(res_cx), UNINIT_VAR(res_cy);
+  double res_area= 0.0, res_cx= 0.0, res_cy= 0.0;
   double cur_area, cur_cx, cur_cy;
   const char *data= m_data;
 
@@ -1631,20 +1630,13 @@ int Gis_multi_polygon::centroid(String *
 	p.centroid_xy(&cur_cx, &cur_cy))
       return 1;
 
-    if (!first_loop)
-    {
-      double sum_area= res_area + cur_area;
-      res_cx= (res_area * res_cx + cur_area * cur_cx) / sum_area;
-      res_cy= (res_area * res_cy + cur_area * cur_cy) / sum_area;
-    }
-    else
-    {
-      first_loop= 0;
-      res_area= cur_area;
-      res_cx= cur_cx;
-      res_cy= cur_cy;
-    }
+    res_area+= cur_area;
+    res_cx+= cur_area * cur_cx;
+    res_cy+= cur_area * cur_cy;
   }
+   
+  res_cx/= res_area;
+  res_cy/= res_area;
 
   return create_point(result, res_cx, res_cy);
 }

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-02-15 11:16:49 +0000
+++ b/sql/sql_base.cc	2010-02-18 13:54:38 +0000
@@ -4168,9 +4168,18 @@ open_and_process_table(THD *thd, LEX *le
       TABLE_LIST is processed. This code works only during re-execution.
     */
     if (tables->view)
-      goto process_view_routines;
-    if (!mysql_schema_table(thd, lex, tables) &&
-        !check_and_update_table_version(thd, tables, tables->table->s))
+    {
+      /*
+        We still need to take a MDL lock on the merged view to protect
+        it from concurrent changes.
+      */
+      if (!open_table_get_mdl_lock(thd, tables, &tables->mdl_request,
+                                   ot_ctx, flags))
+        goto process_view_routines;
+      /* Fall-through to return error. */
+    }
+    else if (!mysql_schema_table(thd, lex, tables) &&
+             !check_and_update_table_version(thd, tables, tables->table->s))
     {
       goto end;
     }

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-02-15 11:16:49 +0000
+++ b/sql/sql_parse.cc	2010-02-23 18:43:26 +0000
@@ -4132,6 +4132,47 @@ create_sp_error:
   case SQLCOM_DROP_PROCEDURE:
   case SQLCOM_DROP_FUNCTION:
     {
+#ifdef HAVE_DLOPEN
+      if (lex->sql_command == SQLCOM_DROP_FUNCTION &&
+          ! lex->spname->m_explicit_name)
+      {
+        /* DROP FUNCTION <non qualified name> */
+        udf_func *udf = find_udf(lex->spname->m_name.str,
+                                 lex->spname->m_name.length);
+        if (udf)
+        {
+          if (check_access(thd, DELETE_ACL, "mysql", NULL, NULL, 1, 0))
+            goto error;
+
+          if (!(res = mysql_drop_function(thd, &lex->spname->m_name)))
+          {
+            my_ok(thd);
+            break;
+          }
+          my_error(ER_SP_DROP_FAILED, MYF(0),
+                   "FUNCTION (UDF)", lex->spname->m_name.str);
+          goto error;
+        }
+
+        if (lex->spname->m_db.str == NULL)
+        {
+          if (lex->drop_if_exists)
+          {
+            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
+                                ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
+                                "FUNCTION (UDF)", lex->spname->m_name.str);
+            res= FALSE;
+            my_ok(thd);
+            break;
+          }
+          my_error(ER_SP_DOES_NOT_EXIST, MYF(0),
+                   "FUNCTION (UDF)", lex->spname->m_name.str);
+          goto error;
+        }
+        /* Fall thought to test for a stored function */
+      }
+#endif
+
       int sp_result;
       int type= (lex->sql_command == SQLCOM_DROP_PROCEDURE ?
                  TYPE_ENUM_PROCEDURE : TYPE_ENUM_FUNCTION);
@@ -4178,34 +4219,6 @@ create_sp_error:
 	}
 #endif
       }
-      else
-      {
-#ifdef HAVE_DLOPEN
-	if (lex->sql_command == SQLCOM_DROP_FUNCTION)
-	{
-          udf_func *udf = find_udf(lex->spname->m_name.str,
-                                   lex->spname->m_name.length);
-          if (udf)
-          {
-            if (check_access(thd, DELETE_ACL, "mysql", NULL, NULL, 1, 0))
-	      goto error;
-
-	    if (!(res = mysql_drop_function(thd, &lex->spname->m_name)))
-	    {
-	      my_ok(thd);
-	      break;
-	    }
-	  }
-	}
-#endif
-	if (lex->spname->m_db.str)
-	  sp_result= SP_KEY_NOT_FOUND;
-	else
-	{
-	  my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
-	  goto error;
-	}
-      }
       res= sp_result;
       switch (sp_result) {
       case SP_OK:
@@ -4217,7 +4230,7 @@ create_sp_error:
           res= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
 	  push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 			      ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
-			      SP_COM_STRING(lex), lex->spname->m_name.str);
+                              SP_COM_STRING(lex), lex->spname->m_qname.str);
           if (!res)
             my_ok(thd);
 	  break;
@@ -5171,7 +5184,6 @@ bool check_global_access(THD *thd, ulong
 	Check stack size; Send error if there isn't enough stack to continue
 ****************************************************************************/
 
-#ifndef EMBEDDED_LIBRARY
 
 #if STACK_DIRECTION < 0
 #define used_stack(A,B) (long) (A - B)
@@ -5209,7 +5221,7 @@ bool check_stack_overrun(THD *thd, long 
 #endif
   return 0;
 }
-#endif /* EMBEDDED_LIBRARY */
+
 
 #define MY_YACC_INIT 1000			// Start with big alloc
 #define MY_YACC_MAX  32000			// Because of 'short'

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-02-15 11:16:49 +0000
+++ b/sql/sql_select.cc	2010-02-23 11:48:26 +0000
@@ -2516,9 +2516,7 @@ static ha_rows get_quick_record_count(TH
 {
   int error;
   DBUG_ENTER("get_quick_record_count");
-#ifndef EMBEDDED_LIBRARY                      // Avoid compiler warning
   uchar buff[STACK_BUFF_ALLOC];
-#endif
   if (check_stack_overrun(thd, STACK_MIN_SIZE, buff))
     DBUG_RETURN(0);                           // Fatal error flag is set
   if (select)

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-02-20 10:07:32 +0000
+++ b/sql/sql_yacc.yy	2010-02-21 19:36:05 +0000
@@ -968,7 +968,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  FOREIGN                       /* SQL-2003-R */
 %token  FOR_SYM                       /* SQL-2003-R */
 %token  FOUND_SYM                     /* SQL-2003-R */
-%token  FRAC_SECOND_SYM
 %token  FROM
 %token  FULL                          /* SQL-2003-R */
 %token  FULLTEXT_SYM
@@ -1494,8 +1493,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %type <date_time_type> date_time_type;
 %type <interval> interval
 
-%type <interval_time_st> interval_time_st
-
 %type <interval_time_st> interval_time_stamp
 
 %type <db_type> storage_engines known_storage_engines
@@ -9535,7 +9532,7 @@ using_list:
         ;
 
 interval:
-          interval_time_st {}
+          interval_time_stamp    {}
         | DAY_HOUR_SYM           { $$=INTERVAL_DAY_HOUR; }
         | DAY_MICROSECOND_SYM    { $$=INTERVAL_DAY_MICROSECOND; }
         | DAY_MINUTE_SYM         { $$=INTERVAL_DAY_MINUTE; }
@@ -9550,27 +9547,6 @@ interval:
         ;
 
 interval_time_stamp:
-          interval_time_st       {}
-        | FRAC_SECOND_SYM
-          { 
-            $$=INTERVAL_MICROSECOND; 
-            /*
-              FRAC_SECOND was mistakenly implemented with
-              a wrong resolution. According to the ODBC
-              standard it should be nanoseconds, not
-              microseconds. Changing it to nanoseconds
-              in MySQL would mean making TIMESTAMPDIFF
-              and TIMESTAMPADD to return DECIMAL, since
-              the return value would be too big for BIGINT
-              Hence we just deprecate the incorrect
-              implementation without changing its
-              resolution.
-            */
-            WARN_DEPRECATED(yythd, 6, 2, "FRAC_SECOND", "MICROSECOND");
-          }
-        ;
-
-interval_time_st:
           DAY_SYM         { $$=INTERVAL_DAY; }
         | WEEK_SYM        { $$=INTERVAL_WEEK; }
         | HOUR_SYM        { $$=INTERVAL_HOUR; }
@@ -12307,7 +12283,6 @@ keyword_sp:
         | FILE_SYM                 {}
         | FIRST_SYM                {}
         | FIXED_SYM                {}
-        | FRAC_SECOND_SYM          {}
         | GEOMETRY_SYM             {}
         | GEOMETRYCOLLECTION       {}
         | GET_FORMAT               {}

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-02-15 14:08:38 +0000
+++ b/sql/sys_vars.cc	2010-02-20 09:40:21 +0000
@@ -2205,30 +2205,6 @@ static Sys_var_bit Sys_log_binlog(
        DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super),
        ON_UPDATE(fix_sql_log_bin));
 
-static bool deprecated_log_update(sys_var *self, THD *thd, set_var *var)
-{
-  /*
-    The update log is not supported anymore since 5.0.
-    See sql/mysqld.cc/, comments in function init_server_components() for an
-    explaination of the different warnings we send below
-  */
-
-  if (opt_sql_bin_update)
-    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                 ER_UPDATE_LOG_DEPRECATED_TRANSLATED,
-                 ER(ER_UPDATE_LOG_DEPRECATED_TRANSLATED));
-  else
-    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                 ER_UPDATE_LOG_DEPRECATED_IGNORED,
-                 ER(ER_UPDATE_LOG_DEPRECATED_IGNORED));
-  return check_has_super(self, thd, var);
-}
-static Sys_var_bit Sys_log_update(
-       "sql_log_update", "alias for sql_log_bin",
-       SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_BIN_LOG,
-       DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(deprecated_log_update), ON_UPDATE(fix_sql_log_bin));
-
 static Sys_var_bit Sys_sql_warnings(
        "sql_warnings", "sql_warnings",
        SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_WARNINGS,

=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt	2010-02-16 22:19:47 +0000
+++ b/storage/innobase/CMakeLists.txt	2010-02-24 01:06:08 +0000
@@ -78,8 +78,8 @@ IF(NOT CMAKE_CROSSCOMPILING)
   )
 ENDIF()
 
-IF(HAVE_IBGCC_ATOMIC_BUILTINS)
- ADD_DEFINITIONS(-DHAVE_IBGCCC_ATOMIC_BUILTINS=1)
+IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
 ENDIF()
 
  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not

Attachment: [text/bzr-bundle] bzr/alik@sun.com-20100225194305-h49uyjrlfl3mwo60.bundle
Thread
bzr push into mysql-next-mr branch (alik:2975 to 2989)Alexander Nozdrin25 Feb