diff -Nru mysql-5.6-5.6.31/client/mysqlbinlog.cc mysql-5.6-5.6.33/client/mysqlbinlog.cc --- mysql-5.6-5.6.31/client/mysqlbinlog.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/client/mysqlbinlog.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1917,6 +1917,12 @@ */ static Exit_status safe_connect() { + /* + A possible old connection's resources are reclaimed now + at new connect attempt. The final safe_connect resources + are mysql_closed at the end of program, explicitly. + */ + mysql_close(mysql); mysql= mysql_init(NULL); if (!mysql) diff -Nru mysql-5.6-5.6.31/client/mysqlimport.c mysql-5.6-5.6.33/client/mysqlimport.c --- mysql-5.6-5.6.31/client/mysqlimport.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/client/mysqlimport.c 2016-08-26 11:22:35.000000000 +0000 @@ -31,6 +31,7 @@ /* Global Thread counter */ uint counter; +pthread_mutex_t init_mutex; pthread_mutex_t counter_mutex; pthread_cond_t count_threshhold; @@ -425,8 +426,19 @@ MYSQL *mysql; if (verbose) fprintf(stdout, "Connecting to %s\n", host ? host : "localhost"); - if (!(mysql= mysql_init(NULL))) - return 0; + if (opt_use_threads && !lock_tables) + { + pthread_mutex_lock(&init_mutex); + if (!(mysql= mysql_init(NULL))) + { + pthread_mutex_unlock(&init_mutex); + return 0; + } + pthread_mutex_unlock(&init_mutex); + } + else + if (!(mysql= mysql_init(NULL))) + return 0; if (opt_compress) mysql_options(mysql,MYSQL_OPT_COMPRESS,NullS); if (opt_local_file) @@ -611,7 +623,7 @@ pthread_cond_signal(&count_threshhold); pthread_mutex_unlock(&counter_mutex); mysql_thread_end(); - + pthread_exit(0); return 0; } @@ -637,15 +649,31 @@ if (opt_use_threads && !lock_tables) { - pthread_t mainthread; /* Thread descriptor */ - pthread_attr_t attr; /* Thread attributes */ + char **save_argv; + uint worker_thread_count= 0, table_count= 0, i= 0; + pthread_t *worker_threads; /* Thread descriptor */ + pthread_attr_t attr; /* Thread attributes */ pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, - PTHREAD_CREATE_DETACHED); + PTHREAD_CREATE_JOINABLE); + pthread_mutex_init(&init_mutex, NULL); pthread_mutex_init(&counter_mutex, NULL); pthread_cond_init(&count_threshhold, NULL); + /* Count the number of tables. This number denotes the total number + of threads spawn. + */ + save_argv= argv; + for (table_count= 0; *argv != NULL; argv++) + table_count++; + argv= save_argv; + + if (!(worker_threads= (pthread_t*) my_malloc(table_count * + sizeof(*worker_threads), + MYF(0)))) + return -2; + for (counter= 0; *argv != NULL; argv++) /* Loop through tables */ { pthread_mutex_lock(&counter_mutex); @@ -660,15 +688,16 @@ counter++; pthread_mutex_unlock(&counter_mutex); /* now create the thread */ - if (pthread_create(&mainthread, &attr, worker_thread, - (void *)*argv) != 0) + if (pthread_create(&worker_threads[worker_thread_count], &attr, + worker_thread, (void *)*argv) != 0) { pthread_mutex_lock(&counter_mutex); counter--; pthread_mutex_unlock(&counter_mutex); - fprintf(stderr,"%s: Could not create thread\n", - my_progname); + fprintf(stderr,"%s: Could not create thread\n", my_progname); + continue; } + worker_thread_count++; } /* @@ -683,9 +712,18 @@ pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime); } pthread_mutex_unlock(&counter_mutex); + pthread_mutex_destroy(&init_mutex); pthread_mutex_destroy(&counter_mutex); pthread_cond_destroy(&count_threshhold); pthread_attr_destroy(&attr); + + for(i= 0; i < worker_thread_count; i++) + { + if (pthread_join(worker_threads[i], NULL)) + fprintf(stderr,"%s: Could not join worker thread.\n", my_progname); + } + + my_free(worker_threads); } else { diff -Nru mysql-5.6-5.6.31/cmake/build_configurations/compiler_options.cmake mysql-5.6-5.6.33/cmake/build_configurations/compiler_options.cmake --- mysql-5.6-5.6.31/cmake/build_configurations/compiler_options.cmake 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/cmake/build_configurations/compiler_options.cmake 2016-08-26 11:22:35.000000000 +0000 @@ -82,7 +82,7 @@ ENDIF() ELSE() # Assume !x86 is SPARC - SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt") + SET(COMMON_C_FLAGS "-g -xstrconst -mt") SET(COMMON_CXX_FLAGS "-g0 -mt") IF(32BIT) SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc") diff -Nru mysql-5.6-5.6.31/CMakeLists.txt mysql-5.6-5.6.33/CMakeLists.txt --- mysql-5.6-5.6.31/CMakeLists.txt 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/CMakeLists.txt 2016-08-26 11:22:35.000000000 +0000 @@ -465,10 +465,6 @@ ADD_SUBDIRECTORY(libmysql) IF(WITH_UNIT_TESTS) - ADD_SUBDIRECTORY(unittest) - ADD_SUBDIRECTORY(unittest/examples) - ADD_SUBDIRECTORY(unittest/mytap) - ADD_SUBDIRECTORY(unittest/mytap/t) # Visual Studio 11 needs this extra flag in order to compile gmock. IF(WIN32) ADD_DEFINITIONS( /D _VARIADIC_MAX=10 ) @@ -477,7 +473,10 @@ IF(HAVE_LLVM_LIBCPP) ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1) ENDIF() - ADD_SUBDIRECTORY(unittest/gunit) + ADD_SUBDIRECTORY(unittest) + ADD_SUBDIRECTORY(unittest/examples) + ADD_SUBDIRECTORY(unittest/mytap) + ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() ADD_SUBDIRECTORY(extra) diff -Nru mysql-5.6-5.6.31/configure.cmake mysql-5.6-5.6.33/configure.cmake --- mysql-5.6-5.6.31/configure.cmake 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/configure.cmake 2016-08-26 11:22:35.000000000 +0000 @@ -153,6 +153,7 @@ GET_FILENAME_COMPONENT(CXX_REALPATH ${CMAKE_CXX_COMPILER} REALPATH) # CC -V yields + # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04 # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11 # CC: Sun C++ 5.11 SunOS_sparc 2010/08/13 @@ -167,9 +168,13 @@ ENDIF() STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr}) + IF (NOT CMAKE_MATCH_1 OR CMAKE_MATCH_1 STREQUAL "") + STRING(REGEX MATCH "CC: Studio 12\\.5 Sun C\\+\\+ 5\\.([0-9]+)" + VERSION_STRING ${stderr}) + ENDIF() SET(CC_MINOR_VERSION ${CMAKE_MATCH_1}) - IF(${CC_MINOR_VERSION} EQUAL 13) + IF(${CC_MINOR_VERSION} GREATER 12) SET(STLPORT_SUFFIX "lib/compilers/stlport4") IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") SET(STLPORT_SUFFIX "lib/compilers/stlport4/sparcv9") diff -Nru mysql-5.6-5.6.31/debian/changelog mysql-5.6-5.6.33/debian/changelog --- mysql-5.6-5.6.31/debian/changelog 2016-07-21 13:16:32.000000000 +0000 +++ mysql-5.6-5.6.33/debian/changelog 2016-09-19 18:00:35.000000000 +0000 @@ -1,3 +1,12 @@ +mysql-5.6 (5.6.33-0ubuntu0.14.04.1) trusty-security; urgency=medium + + * SECURITY UPDATE: Update to 5.6.33 to fix security issues + - CVE-2016-6662 + * debian/rules: new version no longer ships unit.pl. + * debian/control: added libjson-perl to Build-Depends. + + -- Marc Deslauriers Mon, 19 Sep 2016 08:37:23 -0400 + mysql-5.6 (5.6.31-0ubuntu0.14.04.2) trusty-security; urgency=medium * SECURITY UPDATE: Update to 5.6.31 to fix security issues (LP: #1604796) diff -Nru mysql-5.6-5.6.31/debian/control mysql-5.6-5.6.33/debian/control --- mysql-5.6-5.6.31/debian/control 2014-07-21 10:55:37.000000000 +0000 +++ mysql-5.6-5.6.33/debian/control 2016-09-19 18:00:37.000000000 +0000 @@ -16,6 +16,7 @@ gawk, hardening-wrapper, libaio-dev[linux-any], + libjson-perl, libncurses5-dev (>= 5.0-6), libreadline-dev, libwrap0-dev (>= 7.6-8.3), diff -Nru mysql-5.6-5.6.31/debian/patches/spelling.patch mysql-5.6-5.6.33/debian/patches/spelling.patch --- mysql-5.6-5.6.31/debian/patches/spelling.patch 2015-10-26 14:43:49.000000000 +0000 +++ mysql-5.6-5.6.33/debian/patches/spelling.patch 2016-09-19 12:37:10.000000000 +0000 @@ -3,10 +3,10 @@ Preceeding -> preceding Last-Update: 2012-05-19 Forwarded: no -Index: mysql-5.6-5.6.27/libevent/event.3 +Index: mysql-5.6.33/libevent/event.3 =================================================================== ---- mysql-5.6-5.6.27.orig/libevent/event.3 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/libevent/event.3 2015-10-26 10:43:39.726565357 -0400 +--- mysql-5.6.33.orig/libevent/event.3 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/libevent/event.3 2016-09-19 08:37:08.835152879 -0400 @@ -253,7 +253,7 @@ or .Va EV_WRITE . @@ -16,10 +16,10 @@ .Fn event_set , can provide its callback function with a bitwise-OR of more than one triggered event. -Index: mysql-5.6-5.6.27/mysql-test/extra/rpl_tests/rpl_ddl.test +Index: mysql-5.6.33/mysql-test/extra/rpl_tests/rpl_ddl.test =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/extra/rpl_tests/rpl_ddl.test 2015-10-26 10:43:39.726565357 -0400 +--- mysql-5.6.33.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/extra/rpl_tests/rpl_ddl.test 2016-09-19 08:37:08.835152879 -0400 @@ -98,8 +98,8 @@ # --> less switching of AUTOCOMMIT mode on master side. # @@ -31,10 +31,10 @@ # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or -Index: mysql-5.6-5.6.27/mysql-test/extra/rpl_tests/rpl_row_basic.test +Index: mysql-5.6.33/mysql-test/extra/rpl_tests/rpl_row_basic.test =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/extra/rpl_tests/rpl_row_basic.test 2015-10-26 10:43:39.726565357 -0400 +--- mysql-5.6.33.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/extra/rpl_tests/rpl_row_basic.test 2016-09-19 08:37:08.835152879 -0400 @@ -221,7 +221,7 @@ SELECT * FROM t7 ORDER BY C1; @@ -53,10 +53,10 @@ # temprorarily set @@global.slave_exec_mode= 'IDEMPOTENT'; -Index: mysql-5.6-5.6.27/mysql-test/include/wait_until_count_sessions.inc +Index: mysql-5.6.33/mysql-test/include/wait_until_count_sessions.inc =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/include/wait_until_count_sessions.inc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/include/wait_until_count_sessions.inc 2015-10-26 10:43:39.726565357 -0400 +--- mysql-5.6.33.orig/mysql-test/include/wait_until_count_sessions.inc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/include/wait_until_count_sessions.inc 2016-09-19 08:37:08.835152879 -0400 @@ -10,7 +10,7 @@ # 1. We wait for $current_sessions <= $count_sessions because in the use case # with count_sessions.inc before and wait_until_count_sessions.inc after @@ -66,10 +66,10 @@ # sessions at test begin($count_sessions) = m + n # sessions of the previous test which will be soon disconnected = n (n >= 0) # sessions at test end ($current sessions, assuming the test disconnects -Index: mysql-5.6-5.6.27/mysql-test/suite/funcs_1/views/func_view.inc +Index: mysql-5.6.33/mysql-test/suite/funcs_1/views/func_view.inc =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/suite/funcs_1/views/func_view.inc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/suite/funcs_1/views/func_view.inc 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/mysql-test/suite/funcs_1/views/func_view.inc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/suite/funcs_1/views/func_view.inc 2016-09-19 08:37:08.835152879 -0400 @@ -285,7 +285,7 @@ # other interesting value # numbers -> 0 @@ -79,10 +79,10 @@ # FIXME enum, set ?? INSERT INTO t1_values SET my_char_30 = ' ---äÖüß@µ*$-- ', -Index: mysql-5.6-5.6.27/mysql-test/suite/funcs_1/views/views_master.inc +Index: mysql-5.6.33/mysql-test/suite/funcs_1/views/views_master.inc =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/suite/funcs_1/views/views_master.inc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/suite/funcs_1/views/views_master.inc 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/mysql-test/suite/funcs_1/views/views_master.inc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/suite/funcs_1/views/views_master.inc 2016-09-19 08:37:08.835152879 -0400 @@ -545,7 +545,7 @@ # view names are accepted, at creation time, alteration time, # and drop time. @@ -92,10 +92,10 @@ # database name --disable_warnings DROP VIEW IF EXISTS v1 ; -Index: mysql-5.6-5.6.27/mysql-test/suite/rpl/t/rpl_ddl.test +Index: mysql-5.6.33/mysql-test/suite/rpl/t/rpl_ddl.test =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/suite/rpl/t/rpl_ddl.test 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/suite/rpl/t/rpl_ddl.test 2016-09-19 08:37:08.835152879 -0400 @@ -13,10 +13,10 @@ # sequences start. # @@ -109,10 +109,10 @@ # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or -Index: mysql-5.6-5.6.27/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test +Index: mysql-5.6.33/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2016-09-19 08:37:08.835152879 -0400 @@ -239,7 +239,7 @@ UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1; SELECT * FROM t1 ORDER BY a; @@ -122,10 +122,10 @@ # temprorarily set @@global.slave_exec_mode= 'IDEMPOTENT'; --echo **** On Master **** -Index: mysql-5.6-5.6.27/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test +Index: mysql-5.6.33/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test =================================================================== ---- mysql-5.6-5.6.27.orig/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test 2016-09-19 08:37:08.835152879 -0400 @@ -13,10 +13,10 @@ # sequences start. # @@ -139,10 +139,10 @@ # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or -Index: mysql-5.6-5.6.27/sql/abstract_query_plan.cc +Index: mysql-5.6.33/sql/abstract_query_plan.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/abstract_query_plan.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/abstract_query_plan.cc 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/sql/abstract_query_plan.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/abstract_query_plan.cc 2016-09-19 08:37:08.835152879 -0400 @@ -336,7 +336,7 @@ { /* @@ -152,10 +152,10 @@ This operation is therefor not pushable. */ DBUG_PRINT("info", -Index: mysql-5.6-5.6.27/sql/ha_ndbcluster_push.cc +Index: mysql-5.6.33/sql/ha_ndbcluster_push.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/ha_ndbcluster_push.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/ha_ndbcluster_push.cc 2015-10-26 10:43:39.730565406 -0400 +--- mysql-5.6.33.orig/sql/ha_ndbcluster_push.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/ha_ndbcluster_push.cc 2016-09-19 08:37:08.835152879 -0400 @@ -1271,7 +1271,7 @@ if (m_join_scope.contain(referred_table_no)) { @@ -165,11 +165,11 @@ const NdbQueryOperationDef* const parent_op= m_tables[referred_table_no].m_op; DBUG_ASSERT(parent_op != NULL); -Index: mysql-5.6-5.6.27/sql/log_event.cc +Index: mysql-5.6.33/sql/log_event.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/log_event.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/log_event.cc 2015-10-26 10:43:39.730565406 -0400 -@@ -4661,7 +4661,7 @@ +--- mysql-5.6.33.orig/sql/log_event.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/log_event.cc 2016-09-19 08:37:08.839152927 -0400 +@@ -4654,7 +4654,7 @@ if ((error= rows_event_stmt_cleanup(const_cast(rli), thd))) { const_cast(rli)->report(ERROR_LEVEL, error, @@ -178,11 +178,11 @@ "the group log file/position: %s %s", const_cast(rli)->get_group_master_log_name(), llstr(const_cast(rli)->get_group_master_log_pos(), -Index: mysql-5.6-5.6.27/sql/rpl_utility.cc +Index: mysql-5.6.33/sql/rpl_utility.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/rpl_utility.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/rpl_utility.cc 2015-10-26 10:43:39.730565406 -0400 -@@ -1619,7 +1619,7 @@ +--- mysql-5.6.33.orig/sql/rpl_utility.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/rpl_utility.cc 2016-09-19 08:37:08.839152927 -0400 +@@ -1644,7 +1644,7 @@ void Deferred_log_events::rewind() { /* @@ -191,11 +191,11 @@ deferred because of slave side filtering. */ if (!is_empty()) -Index: mysql-5.6-5.6.27/sql/sql_optimizer.cc +Index: mysql-5.6.33/sql/sql_optimizer.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/sql_optimizer.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/sql_optimizer.cc 2015-10-26 10:43:39.734565455 -0400 -@@ -971,7 +971,7 @@ +--- mysql-5.6.33.orig/sql/sql_optimizer.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/sql_optimizer.cc 2016-09-19 08:37:08.839152927 -0400 +@@ -973,7 +973,7 @@ } } } @@ -204,10 +204,10 @@ (simple_order || skip_sort_order)) // which is possibly skippable { if (test_if_skip_sort_order(tab, order, m_select_limit, false, -Index: mysql-5.6-5.6.27/sql/sql_rewrite.cc +Index: mysql-5.6.33/sql/sql_rewrite.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/sql_rewrite.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/sql_rewrite.cc 2015-10-26 10:43:39.734565455 -0400 +--- mysql-5.6.33.orig/sql/sql_rewrite.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/sql_rewrite.cc 2016-09-19 08:37:08.839152927 -0400 @@ -40,7 +40,7 @@ @@ -226,11 +226,11 @@ @param str The string to append to @param comma Prepend a comma? -Index: mysql-5.6-5.6.27/sql/sql_yacc.cc +Index: mysql-5.6.33/sql/sql_yacc.cc =================================================================== ---- mysql-5.6-5.6.27.orig/sql/sql_yacc.cc 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/sql_yacc.cc 2015-10-26 10:43:39.738565503 -0400 -@@ -39094,7 +39094,7 @@ +--- mysql-5.6.33.orig/sql/sql_yacc.cc 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/sql_yacc.cc 2016-09-19 08:37:08.843152974 -0400 +@@ -37176,7 +37176,7 @@ { /* Not in trigger assigning value to new row, @@ -239,11 +239,11 @@ */ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; -Index: mysql-5.6-5.6.27/sql/sql_yacc.yy +Index: mysql-5.6.33/sql/sql_yacc.yy =================================================================== ---- mysql-5.6-5.6.27.orig/sql/sql_yacc.yy 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/sql/sql_yacc.yy 2015-10-26 10:43:39.738565503 -0400 -@@ -14585,7 +14585,7 @@ +--- mysql-5.6.33.orig/sql/sql_yacc.yy 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/sql/sql_yacc.yy 2016-09-19 08:37:08.847153022 -0400 +@@ -14596,7 +14596,7 @@ | SESSION_SYM '.' { $$=OPT_SESSION; } ; @@ -252,7 +252,7 @@ option_value_following_option_type: internal_variable_name equal set_expr_or_default { -@@ -14602,7 +14602,7 @@ +@@ -14613,7 +14613,7 @@ { /* Not in trigger assigning value to new row, @@ -261,7 +261,7 @@ */ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; -@@ -14610,7 +14610,7 @@ +@@ -14621,7 +14621,7 @@ } ; @@ -270,10 +270,10 @@ option_value_no_option_type: internal_variable_name equal { -Index: mysql-5.6-5.6.27/storage/myisam/mi_rnext.c +Index: mysql-5.6.33/storage/myisam/mi_rnext.c =================================================================== ---- mysql-5.6-5.6.27.orig/storage/myisam/mi_rnext.c 2015-10-26 10:43:39.742565552 -0400 -+++ mysql-5.6-5.6.27/storage/myisam/mi_rnext.c 2015-10-26 10:43:39.738565503 -0400 +--- mysql-5.6.33.orig/storage/myisam/mi_rnext.c 2016-09-19 08:37:08.847153022 -0400 ++++ mysql-5.6.33/storage/myisam/mi_rnext.c 2016-09-19 08:37:08.847153022 -0400 @@ -65,7 +65,7 @@ Normally SQL layer would never request "search next" if "search first" failed. But HANDLER may do anything. diff -Nru mysql-5.6-5.6.31/debian/rules mysql-5.6-5.6.33/debian/rules --- mysql-5.6-5.6.31/debian/rules 2015-10-26 19:52:53.000000000 +0000 +++ mysql-5.6-5.6.33/debian/rules 2016-09-19 13:32:43.000000000 +0000 @@ -141,7 +141,6 @@ override_dh_auto_test: @echo "RULES.$@" ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) - cp unittest/unit.pl $(builddir)/unittest/ cp -r mysql-test/* $(builddir)/mysql-test/ cp -r sql/share/* $(builddir)/sql/share/ cp -r scripts/*sql $(builddir)/scripts/ diff -Nru mysql-5.6-5.6.31/Docs/ChangeLog mysql-5.6-5.6.33/Docs/ChangeLog --- mysql-5.6-5.6.31/Docs/ChangeLog 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/Docs/ChangeLog 2016-08-26 11:32:53.000000000 +0000 @@ -1,1163 +1,771 @@ -commit 933465dc2c781fafb7d56511cf91cb6c54fe3d6c -Author: Shishir Jaiswal -Date: Mon May 16 13:47:58 2016 +0530 +commit 259f2ca9477c92b6e9a91cb37dac19d24ffcacd9 +Author: Terje Rosten +Date: Fri Aug 26 11:26:23 2016 +0200 Merge branch 'mysql-5.5' into mysql-5.6 - (cherry picked from commit d8de93d8853fce9246c5ada4de4b47b1f59b912e) + (cherry picked from commit fa1aafe9819cb2d9389968f95f91f00f58997df4) -commit 70145f2d8b0eb0793c9255088e1e9b98af7bca3e -Author: Yashwant Sahu -Date: Fri May 13 11:35:58 2016 +0530 +commit cd9aa1d8f0d18c9cabe763ed4dfef17f7f6bd62e +Author: Sivert Sorumgard +Date: Wed Aug 24 14:03:11 2016 +0200 - Bug#22669012: SERVER CRASH AT OPENSSL_CONFIG IF OPENSSL_UDF FUNCTION. - - Post push fix. + Merge branch 'mysql-5.5' into mysql-5.6 - (cherry picked from commit 58c739cb49869be45ab68348b962e3e37ceb1a97) + (cherry picked from commit 3084723f76d19990f3573c5ec614709f567df78b) -commit 6c298096aaae6badc1ba6bf87142edd25b30ffea -Author: Sujatha Sivakumar -Date: Fri May 13 16:44:23 2016 +0530 +commit 4dec730874c3669d3dfe6b42e8e10790993ab69b +Author: Jon Olav Hauglid +Date: Fri Aug 19 09:16:27 2016 +0200 Merge branch 'mysql-5.5' into mysql-5.6 - (cherry picked from commit 3c6c5aa14d0b0e4362e26ea8964c9a7a790e0802) + (cherry picked from commit 3682c8928e0b538739ca3d7c93b74e3bd2f9a001) -commit 28573a56b7f311a951e6c6d1ae460be220676fe5 -Author: Balasubramanian Kandasamy -Date: Thu May 12 15:05:21 2016 +0530 +commit 6c4c5c8cf205c4fae0182ce8e2c9f92a8bd43321 +Author: Terje Rosten +Date: Thu Aug 18 16:49:08 2016 +0200 - BUG#23273818 - MARIADB-SERVER-GALERA NOT REPLACED WITH COMMUNITY PACKAGES DURING FC24 UPGRADE - - Add obsolete on mariadb-server-galera similar to mariadb-galera-server. + Merge branch 'mysql-5.5' into mysql-5.6 - (cherry picked from commit 0972c605629fd1ce350efb56a4ac8e537281a007) + (cherry picked from commit b91d851f82ba70bf775422d42c0e853f9116cbb1) -commit ccad17c02e4db24fe7e9db113e835e4de00517a0 -Author: Yashwant Sahu -Date: Wed May 11 21:03:45 2016 +0530 +commit e945f3b6e99d23c89dc9580885e4bf89ab006ccf +Author: Deepa Dixit +Date: Fri Aug 5 16:09:51 2016 +0530 - Bug #22669012: SERVER CRASH AT OPENSSL_CONFIG. + Bug#22818781: EXPLAIN_JSON_VALIDATE.TEST FAILS ON WINDOWS PRE-PUSH TESTING - Post push fix. + Issue: + ------ + The explain_json_validate test calls a python script which accepts arguments. + If the arguments are passed with wildcard characters, Windows cannot parse + them and hence the test fails. - (cherry picked from commit 6532334b8c59976fad77ef2fb14cc7d635f240a4) + Fix: + ---- + The fix involved adding an additional check if the test was running on Windows + so that the arguments can be parsed correctly. + Also, Python is not installed on Windows by default, and therefore the + script is now ported to perl. Before the test used to be skipped if the machine + did not have either Python or JSON support, but now it fails if it does not + have JSON or perl support. + Since the python script has been removed, all the tests which were using that + script are now using the perl script. + + Reviewed-by: Horst Hunger + Reviewed-by: Guilhem Bichot + RB: 12537 -commit 35c28bee09ee92176ca1f841aa2bccd5cd508513 -Author: Yashwant Sahu -Date: Wed May 11 13:44:13 2016 +0530 +commit 63a16c346f535990309f9985ffc4aabf1fe6cd5e +Author: Shaohua Wang +Date: Fri Aug 5 09:05:18 2016 +0200 - Bug #22669012: SERVER CRASH AT OPENSSL_CONFIG IF OPENSSL_UDF FUNCTION CREATED/DROPPED FROM MTR. + BUG#23760086 INNODB: ASSERTION FAILURE: MACH0DATA.IC:56:(N | 0XFFFFUL) + <= 0XFFFFUL - (cherry picked from commit 8e83bb529ed741c38959c5783bdd43b7ca4a602d) - -commit 27cc2a34b5e20d4e340a25d26de98edda63eab2a -Author: Thirunarayanan Balathandayuthapani -Date: Thu May 5 19:05:10 2016 +0530 - - Bug #23227804 MYSQL 5.6 DON'T BUILD ON FEDORA 24 WITH GCC 6 + Analysis: In row_log_table_delete(), extern size could be greater + than 2 bytes int if there are enough index on blob columns. - a) Split each assert into individual assers when '&&' used. - b) Change the assert or condition from var to var != NULL. - c) Space between string and macro. - d) To avoid left shift of negative value error, - change (~0 << val) to (~0U << val). + Solution: Use 4 bytes int other than 2 bytes for extern size. - Reviewed-by: Naga Satyanarayana Bodapati - RB: 12600 - (cherry picked from commit 6ee186cee7f6411c33b88f1e5b9b9951c9eec699) - -commit faf221e8ae7dbd699b9a916839545d640b971c5c -Author: Lars Tangvald -Date: Tue May 3 09:28:35 2016 +0200 - - Added deb-xenial directory to packaging - - To support building on Ubuntu 16.04. Based on 15.10 packaging - - (cherry picked from commit bcfafb0da1bd1d4e63e6e66f6e9235f0e9f5da9f) + Reviewed-by: Marko Mäkelä + RB: 13573 -commit f6dc833e597726b37669981dd68d43438b99b7a3 -Merge: 6fd38b4 bf4f206 -Author: Harin Vadodaria -Date: Fri Apr 29 12:42:16 2016 +0530 +commit e20773a9cc7f5a0754fd0448836af1f37297cfdb +Merge: 8a9431a b3e3e9c +Author: Neha Kumari +Date: Fri Aug 5 12:34:21 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit bf4f206f697889a7ae068f7d21a4aeb6e6a7ec74 -Author: Harin Vadodaria -Date: Fri Apr 29 11:06:41 2016 +0530 - - Bug#21973610 - - Post push fix : Fixing i_main.mysqlshow failure. - -commit 6fd38b488fdfb3e9e1626075f4671fa2f15571e2 -Author: Sreeharsha Ramanavarapu -Date: Thu Apr 28 08:39:09 2016 +0530 +commit b3e3e9c7ed5526dff4f0bc222e674239b352ee27 +Author: Neha Kumari +Date: Fri Aug 5 12:17:11 2016 +0530 - Bug #22305361: QUERY WITH MATERIALIZED TABLE RETURNS - INCORRECT RESULTS IN 5.6 + Bug#23540182:MYSQLBINLOG DOES NOT FREE THE EXISTING CONNECTION BEFORE OPENING NEW REMOTE ONE - Issue - ----- - This issue occurs with a query of the form - SQ1 IN (SQ2 IN (SQ3)). To handle the first IN, a semijoin - is used and the subquery is materialized. The second IN - is converted to EXISTS optimization. - - During IN-TO-EXISTS transform for SQ3, - Item_in_subselect's used_tables_cache is set to 3 instead - of 2. This is because is a direct_ref to - concat(a,''). It visits Item_ref::resolved_used_tables. - The used_tables_cache of concat(a,'') is set to 1. This - difference allows for the condition to be eliminated by - make_cond_for_table_from_pred, since the table, represented - by used_tables_cache, is not referenced. + It happens when you are trying to read two or more log files from a + remote server using mysqlbinlog utility. + The reason for this is no matching mysql_close() that concludes the + life time of 'mysql' struct describing connection to the server. + This happens when mysqlbinlog is invoked with connecting to the server + and requesting more than one binlog file. In such case + dump_remote_log_entries() keeps calling safe_connect() per eachfile, + never caring to invoke mysql_close(). Only the final safe_connect()'s + allocation effect are cleaned by the base code. + That is with 2 files there's one 'mysql' connection descriptor struct + uncleaned/deallocated. - SOLUTION: - --------- - This is the same problem fixed in Bug#21139722. + We are backporting the bug 21255763 (pushed in mysql-trunk) + in the earlier version of MySQL starting from 5.5 to 5.7. + which was pushed in mysql-trunk. - The issue is solved by creating a new used_tables_for_level - for Item_field class. This will return the table number if - the column is resolved in the current query block. If it is - resolved in an outer query block, the appropriate value is - returned. - - Since constant tables are not handled in - Item_field::used_tables_for_level, Bug#21139402 is also - backported. - -commit ac18af362dd7e26494c91300cc8bc627d2b652b1 -Merge: e7899d1 d36cd34 -Author: Nisha Gopalakrishnan -Date: Wed Apr 27 14:23:51 2016 +0530 + Fix: + Invoke mysql_close() just before mysql_init() in safe_connect() + defined in mysqlbinlog.cc. That makes possibly previously used 'mysql' be + reclaimed prior a new one is allocated. + +commit 8a9431a180225f1aeb8238ffcc1a6deebfba1f25 +Merge: c32616e 3cde802 +Author: Kailasnath Nagarkar +Date: Thu Aug 4 12:50:48 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit e7899d1394c6d41d4bf3a0872d0769a787630a5a -Author: Aditya A -Date: Mon Apr 25 21:31:56 2016 +0530 +commit 3cde80250f0592cf4270986f28946fdb1d440fc4 +Author: Kailasnath Nagarkar +Date: Thu Aug 4 12:49:50 2016 +0530 - Bug #21133329 HANGING "SYSTEM LOCK" WHEN EXECUTING "FLUSH TABLE ... FOR EXPORT" + Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN PROTOCOL_TEXT::STORE_LONG - Post push failure fix for compilation error in some platforms + Reverting the patch due to some issues. -commit 4e714b247fdce35a3058a180b3f3fb47a86f20c1 -Author: Aditya A -Date: Mon Apr 25 12:37:46 2016 +0530 +commit c32616e41ad7b4f5dbe5fbdee44fd8be686f8d04 +Merge: ee675f2 c3743ff +Author: Kailasnath Nagarkar +Date: Wed Aug 3 12:57:38 2016 +0530 - Bug #21133329 HANGING "SYSTEM LOCK" WHEN EXECUTING "FLUSH TABLE ... FOR EXPORT" - - - PROBLEM - ------- - - 1. ibuf_contarct_in background() function is trying to merge - all pages related to a certain table (which contains no record). - while in background heavy DML operations are happening. - 2. When contracting the pages in ibuf_merge_space() we call - ibuf_get_merge_pages() to get the pages to be merged.This function - call returns the volume ( in bytes) of pages to be merged. - 3. In our case , the returned volume is zero since there are no pages - to be merged ,but we increment the volume returned by 1 . - 4. This volume is returned to ibuf_contract_in_background() which - assumes that some pages have been merged and doesn't break the loop - It doesn't check if any pages have been merged but assumes that since - volume is non zero some pages are merged and waits for it to reach - sum_pages and gets stuck in this loop - - FIX - --- - - 1) The reason we increment the volume by 1 ,is because the function - is supposed to return zero only if the ibuf tree is empty. - 2) To fix this we first have delinked the ibuf_merge_space() from the loop - present in ibuf_contarct_in background() , it is independently called - during quisec and returns number of pages merged instead of the size. - 3) Also as part of this fix we have backported Bug19724300 to make used of space_id - instead of table id. - - Bug#19724300 REMOVE TABLE LOOKUPS FROM THE CHANGE BUFFER - - When exporting a tablespace, InnoDB needs to merge all buffered changes to - that tablespace. However, the API for that is using the table_id, and we are - performing unnecessary table lookups in the change buffer. The lookups should - never fail (there is dead code), because MDL will be preventing a concurrent - ALTER/TRUNCATE/DROP TABLE while the export operation is pending. - - ibuf_get_table(): Remove. + Merge branch 'mysql-5.5' into mysql-5.6 + +commit c3743ff9b7813e9942d11ae8856a1732f830c941 +Author: Kailasnath Nagarkar +Date: Wed Aug 3 12:54:58 2016 +0530 + + Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN PROTOCOL_TEXT::STORE_LONG - ibuf_merge(): Replace table_id with space_id. + ISSUE: Queries with mediumint as column when operated with + long long type of data results in buffer overflow in + store_long function. - ibuf_contract(): Call ibuf_merge_pages() directly. + The merging rule specified for (MYSQL_TYPE_LONGLONG + MYSQL_TYPE_INT24) is MYSQL_TYPE_LONG. Due to this store_long + function was getting called which resulted in buffer overflow. - ibuf_merge_in_background(): Renamed from ibuf_contract_in_background(). - Replace table_id with space_id. + SOLUTION: + The correct merging rule for (MYSQL_TYPE_LONGLONG, + MYSQL_TYPE_INT24) should be MYSQL_TYPE_LONGLONG. + So, instead of function store_long, function store_longlong + is called which correctly handles the type MYSQL_TYPE_LONGLONG. - [#rb12209 AND #rb6890 approved by jimmy ] + External Bug #23645238 is a duplicate of this issue. -commit d36cd341d121bfd9a68f90fce6dfd2526fa9a8c8 -Author: Nisha Gopalakrishnan -Date: Fri Apr 22 10:25:16 2016 +0530 - - BUG#23135731: INSERT WITH DUPLICATE KEY UPDATE REPORTS - INCORRECT ERROR. - - Analysis - ======== - INSERT with DUPLICATE KEY UPDATE and REPLACE on a table - where foreign key constraint is defined fails with an - incorrect 'duplicate entry' error rather than foreign - key constraint violation error. - - As part of the bug fix for BUG#22037930, a new flag - 'HA_CHECK_FK_ERROR' was added while checking for non fatal - errors to manage FK errors based on the 'IGNORE' flag. For - INSERT with DUPLICATE KEY UPDATE and REPLACE queries, the - foreign key constraint violation error was marked as non-fatal, - even though IGNORE was not set. Hence it continued with the - duplicate key processing resulting in an incorrect error. - - Fix: - === - Foreign key violation errors are treated as non fatal only when - the IGNORE is not set in the above mentioned queries. Hence reports - the appropriate foreign key violation error. - -commit bd8d35520d2fc3d3d12e972d9667e59f0dadfa34 -Merge: 1a88e27 9408ac7 -Author: Karthik Kamath -Date: Tue Apr 19 14:51:54 2016 +0530 +commit ee675f2d77915b7ebc55cd7e90365581261f90ff +Merge: 6a9abb6 2a774df +Author: Sreeharsha Ramanavarapu +Date: Wed Aug 3 09:59:37 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit 9408ac7a301718182dbefb2fe122ae11e6e42c4c -Author: Karthik Kamath -Date: Tue Apr 19 14:49:27 2016 +0530 +commit 2a774df598b8651897a4394e20ca2bfac6de2512 +Author: Sreeharsha Ramanavarapu +Date: Wed Aug 3 09:58:36 2016 +0530 - BUG#22286421: NULL POINTER DEREFERENCE + Bug #24380263: INCORRECT BEHAVIOR WITH PARAMETER AND + DERIVED TABLE IN JOIN - ANALYSIS: - ========= - A LEX_STRING structure pointer is processed during the - validation of a stored program name. During this processing, - there is a possibility of null pointer dereference. - - FIX: - ==== - check_routine_name() is invoked by the parser by supplying a - non-empty string as the SP name. To avoid any potential calls - to check_routine_name() with NULL value, a debug assert has - been added to catch such cases. - -commit 1a88e27ff4948ff71d6e30447c3f975e9ea39519 -Merge: b655666 5bdafc8 -Author: Sujatha Sivakumar -Date: Tue Apr 19 11:47:21 2016 +0530 - - Bug#22897202: RPL_IO_THD_WAIT_FOR_DISK_SPACE HAS OCCASIONAL - FAILURES + ISSUE: + ------ + This problem occurs under the following conditions: + 1) A parameter is used in the select-list of a derived table. + 2) The derived table is part of a JOIN. - Merge branch 'mysql-5.5' into mysql-5.6 + SOLUTION: + --------- + When a derived table is materialized, a temporary table is + created. This temporary table creates a field each for the + items in the select-list of the derived table. This set of + fields is later used to setup the join. + + Currently no field is created in the temporary table if a + parameter is used in the select-list. + + Create a field for the parameter. By default Item_param's + result type in a prepared statement is set to + STRING_RESULT. This can change during the execute phase + depending on the user variable. But since the execute phase + creates its own temporary table, it will be handled + separately. + + This is a backport of the fix for BUG#22392374. + +commit 6a9abb618aebb0624eb307a0f9f58604047e01c8 +Author: Srikanth B R +Date: Mon Aug 1 18:53:44 2016 +0530 -commit 5bdafc8efe1d2f7cf411e5705d90ac5668a88ca1 -Author: Sujatha Sivakumar -Date: Mon Apr 11 11:41:47 2016 +0530 + Bug#22342399: MTR LIMITS PARALLEL TESTS TO 50 + + Issue: + ------ + The number of parallel workers in mysql-test-run has an artificial + limit of 50. On some hardware, more CPU's are present and having + --parallel > 50 leads to MTR running out of unique build thread ids + as it has a hard-coded upper limit(50 build thread id's) for them. + + Fix: + ---- + The patch attached removes the arbitrary limit and sets the upper + build thread limit based on the value given to --parallel. Two other + small changes relevant for running with high parallel settings have + been included: + 1)The number of parallel workers is now restricted to number of tests + for avoiding idle workers. + 2)The maximum number of parallel workers was restricted to 8 for + --parallel=auto in case the environment variable MTR_MAX_PARALLEL + was not set. This restriction has been removed as it hinders MTR + performance on powerful machines. + + Reviewed-by: Bjorn Munch + RB: 13472 + +commit 33b15f9f52214ad1663345e9f123ad613f6f4a28 +Author: Srikanth B R +Date: Mon Aug 1 18:31:13 2016 +0530 - Bug#22897202: RPL_IO_THD_WAIT_FOR_DISK_SPACE HAS OCCASIONAL - FAILURES + Bug#23742016: MTR --PARALLEL=AUTO IS ALWAYS 1 ON OSX - Analysis: - ========= - Test script is not ensuring that "assert_grep.inc" should be - called only after 'Disk is full' error is written to the - error log. - - Test checks for "Queueing master event to the relay log" - state. But this state is set before invoking 'queue_event'. - Actual 'Disk is full' error happens at a very lower level. - It can happen that we might even reset the debug point - before even the actual disk full simulation occurs and the - "Disk is full" message will never appear in the error log. - - In order to guarentee that we must have some mechanism where - in after we write "Disk is full" error messge into the error - log we must signal the test to execute SSS and then reset - the debug point. So that test is deterministic. + Issue: + ------ + MTR currently checks for CPU information using '/proc/cpuinfo' on + linux and 'kstat' on solaris. As no information can be obtained + from them on OS-X, a dummy CPU is added and the number of CPU's is + reported as 1 by default. Hence, using --parallel=auto leads to + MTR running tests on a single worker. Fix: - === - Added debug sync point to make script deterministic. + ---- + A routine has been added to get CPU information on OS-X using the + 'sysctl' command. The number of parallel MTR workers is set to the + number of processors in the machine. + + Reviewed-by: Sayantan Dutta + RB: 13389 -commit b655666361888699ef4a0a6901ebed87df13775b -Author: Shaohua Wang -Date: Mon Apr 18 12:39:36 2016 +0800 +commit 6ea08b4fa03d656873b816fca073f00170dfc7a2 +Author: Tor Didriksen +Date: Mon Aug 1 13:23:31 2016 +0200 - Followup: BUG#22996488 - CRASH IN FTS_SYNC_INDEX WHEN DOING DDL IN A LOOP + Bug#24303829 ADD SUPPORT FOR SOLARIS STUDIO 12.5 AKA 5.14 TO MYSQL 5.6 - Reviewed-by: Jimmy Yang - RB: 12340 + Additional patch for cmake version 2.8.12.2 -commit 441c2ddef5dc9cf908c0b0da6c71b9ca71213054 -Author: Shaohua Wang -Date: Thu Apr 14 18:09:06 2016 +0800 +commit f31d2752f2309fdafe550beb10381065991445ea +Merge: 6a86a16 f84c952 +Author: Prashant Tekriwal +Date: Fri Jul 29 14:23:36 2016 +0200 - BUG#22996488 - CRASH IN FTS_SYNC_INDEX WHEN DOING DDL IN A LOOP - - Problem: - The index cache has been freed by DROP INDEX when we are syncing - a index cache in background. - - Solution: - Acquire dict_operation_lock to prevent DDL like purge thread. - - Reviewed-by: Jimmy Yang - RB: 12340 + Merge branch 'mysql-5.6.32-release' into mysql-5.6 -commit 6e120f9e2e121737af4cf19df9faf0b57bf4c337 -Merge: fa986f1 7b2fa28 -Author: Sreedhar.S -Date: Thu Apr 14 14:20:49 2016 +0530 +commit 6a86a16ee00e275ff1d72472b9c1e61e7c36e9a0 +Merge: e206e0a 3bc2b57 +Author: Nawaz Nazeer Ahamed +Date: Fri Jul 29 16:52:58 2016 +0530 - Merge branch 'mysql-5.5' into mysql-5.6 + Upmerge of the 5.5.51 build -commit 7b2fa28fedf715070e2dc9ed5a2a8a9dbe592cfb -Author: Sreedhar.S -Date: Thu Apr 14 14:18:23 2016 +0530 +commit 3bc2b572967a4a67a6a3a0b41a0199f81d4339c4 +Merge: a0738f7 0496931 +Author: Nawaz Nazeer Ahamed +Date: Fri Jul 29 16:46:56 2016 +0530 - Fix for Bugs#14583183 and 19949163 + Merge branch 'mysql-5.5.51-release' into mysql-5.5 -commit fa986f1f8bc8d4d46a843c4ae7d01cf44aa04edf -Author: Arun Kuruvila -Date: Wed Apr 13 11:14:56 2016 +0530 +commit e206e0a6e43790084070cf50617505ffbd19ab24 +Author: Tor Didriksen +Date: Fri Jul 15 16:48:33 2016 +0200 - Bug#22578574: MEMORY LEAK FROM OPEN FILES LIMIT + Bug#24303829 ADD SUPPORT FOR SOLARIS STUDIO 12.5 AKA 5.14 TO MYSQL 5.6 - Description:- Buffered_logs are never freed when on a server - build with -DWITH_PERFSCHEMA_STORAGE_ENGINE=0. + Parse new output from 'CC -V' - Analysis:- Buffered logs are neither printed nor freed on a - server build with -DWITH_PERFSCHEMA_STORAGE_ENGINE=0. This - is because of the conditional compilation derivative, - "WITH_PERFSCHEMA_STORAGE_ENGINE" used inside the function, - "init_server_components()". + Remove '-Xa' from COMMON_C_FLAGS (prefer ISO C rather than K&R C semantics) + It is not needed, and it cannot be used together with the -std=xxx flag. - Fix:- The conditional derivative is removed so that even - without performchema storage engine, buffered logs are - printed and freed. + This is a partial backport of the fix for: + Bug#23212938 ADD SUPPORT FOR SOLARIS STUDIO 12.5 AKA 5.14 -commit bb41c6735fde8304f2a20fc841f7107b6bb8afa3 -Author: Arun Kuruvila -Date: Wed Apr 13 11:08:17 2016 +0530 - - Bug #21616496: CREATE USER ACCEPTS PLUGIN AND PASSWORD HASH, - BUT IGNORES THE PASSWORD HASH - - Description: Creating a user with 'mysql_native_password'/ - 'mysql_old_password' as plugin and using "IDENTIFIED WITH - plugin AS 'hash_string'" as syntax, creates one without - a password. - - Analysis: In 5.5 and 5.6, the "AS" part in "IDENTIFIED WITH - ... AS " serves a different purpose and not for - storing the password. According to the documentation, the - is stored into the "authentication_string" - column of the mysql.user table. And the password for the - native authentication plugin is never read from this column - instead its read from the "password" column. - - Fix: The bug is reclassified as a password validation plugin - bug. The fix is to throw an error, "ERROR 1819 (HY000): Your - password does not satisfy the current policy requirements", - when a user is created with 'mysql_native_password'/ - 'mysql_old_password' as plugin and using "IDENTIFIED WITH - plugin AS 'hash_string'" as syntax. The error is thrown only - if the "validate_password" plugin is installed. - -commit a0e55d9602477f9d5ce963377fde575c465de6dd -Author: Arun Kuruvila -Date: Wed Apr 13 10:59:26 2016 +0530 +commit 3044190d26089ad5cc54e229a58e41018a4debe0 +Author: Shaohua Wang +Date: Wed Jul 27 10:39:19 2016 +0200 - Bug#18284273: MYSQLDUMP SILENTLY QUITS WHEN IT ENCOUNTERS AN - ERROR. + Followup: BUG#23479595 SEGMENTATION FAULT WHEN SELECT FTS INDEX + TABLES IN INFORMATION SCHEMA - Description:- The client utility, "mysqldump" fails silently - without printing any error message when it encounters an - error while executing FLUSH LOGS. + BUG#23742339 FAILING ASSERTION: SYM_NODE->TABLE != NULL - Analysis:- "mysqldump" uses the C API, "mysql_refresh()", to - flush the logs. Currently no error messages are printed upon - "mysql_refresh()" failure in "mysqldump". + Analysis: When we access fts aux tables in information schema,the + fts aux tables are dropped by DROP DATABASE in another session. - Fix:- Proper error messages are printed upon "mysql_refresh()" - failure. + Solution: Drop parent table if it's a fts aux table, and drop + table will drop fts aux tables together. - NOTE:- mtr test case is not added since its difficult to - simulate an error for "mysql_refresh()" through mtr. + Reviewed-by: Jimmy Yang + RB: 13264 -commit 6ba5216083680d36c4becd6de14ddb798690f372 -Author: Erlend Dahl -Date: Tue Apr 12 10:57:02 2016 +0200 +commit 800b8766bde7353293b8784e604b60af20dacce5 +Author: Shaohua Wang +Date: Wed Jul 27 09:37:20 2016 +0200 - Bug#23088916 REMOVE SUPPORT-FILES/MACOSX/README.TXT + BUG#24315031 FAILING ASSERTION: !TABLE->CAN_BE_EVICTED - This file no longer contains useful information. + Analysis: + the old table is dropped, just after it's added into drop list, + and new table with the same name is created, then we try to drop + the new table in background. - Fix approved by Terje Rosten - -commit 4865ea26530ef9d6257ebecefcaeb091b06e6cb3 -Merge: bc610e7 6343624 -Author: Hery Ramilison -Date: Mon Apr 11 19:12:30 2016 +0200 - - Merge branch 'mysql-5.6.30-release' into mysql-5.6 + Solution: + Don't drop a table in background if table->to_be_dropped is false. + + Reviewed-by: Jimmy Yang + RB: 13414 -commit bc610e7e42011933c374cba2be665e66a3db12ed +commit c5728a8a29ed496c09c58751a860db9af962ae59 Author: Shaohua Wang -Date: Thu Apr 7 11:37:32 2016 +0800 +Date: Wed Jul 27 03:43:52 2016 +0200 - BUG#22963169 MYSQL CRASHES ON CREATE FULLTEXT INDEX + BUG#24009272 SEGFAULT WITH CREATE+SELECT FROM IS+DROP FTS TABLE + CONCURRENTLY - The crash is because of length mismatch. + Analysis: + When we access fts_internal_tbl_name in i_s_fts_config_fill (), + it can be set to NULL by another session. - since the max length for FTS token now is larger than 255, so - we will need to signify length byte itself, so only 1 to 128 - bytes can be used for 1 bytes, larger than that 2 bytes. + Solution: + Define fts_internal_tbl_name2 for global variable innodb_ft_aux_table, + if it's NULL, set fts_internal_tbl_name to "default". Reviewed-by: Jimmy Yang - RB: 12334 - -commit 1e4035d32ba333ba51962e5195d5c7f448cb0e67 -Author: Tor Didriksen -Date: Tue Mar 22 13:03:06 2016 +0100 + RB: 13401 - Bug#22980983 ADD CMAKE OPTION TO ENABLE ALTERNATIVE SYMBOL VERSIONING IN LIBMYSQCLIENT IN 5.6 - - Stop patching when building on Fedora, include the source protected - by #ifdefs instead. - -commit e47f04c145cf778b9ad47ad8957f42a6daaadd5b -Author: Thirunarayanan Balathandayuthapani -Date: Mon Apr 4 12:32:48 2016 +0530 +commit 4d4c42e2ba8a44c9c7160ecf1192de8e635c0312 +Author: Dmitry Lenev +Date: Mon Jul 25 16:06:52 2016 +0300 + + Fix for bug #16672723 "CAN'T FIND TEMPORARY TABLE". + + Attempt to execute prepared CREATE TABLE SELECT statement which used + temporary table in the subquery in FROM clause and stored function + failed with unwarranted ER_NO_SUCH_TABLE error. The same happened + when such statement was used in stored procedure and this procedure + was re-executed. + + The problem occurred because execution of such prepared statement/its + re-execution as part of stored procedure incorrectly set + Query_table_list::query_tables_own_last marker, indicating the last + table which is directly used by statement. As result temporary table + used in the subquery was treated as indirectly used/belonging to + prelocking list and was not pre-opened by open_temporary_tables() + call before statement execution. Thus causing ER_NO_SUCH_TABLE errors + since our code assumes that temporary tables need to be correctly + pre-opened before statement execution. + + This problem became visible only in version 5.6 after patches related to + bug 11746602/27480 "EXTEND CREATE TEMPORARY TABLES PRIVILEGE TO ALLOW + TEMP TABLE OPERATIONS" since they have introduced pre-opening of temporary + tables for statements. + + Incorrect setting of Query_table_list::query_tables_own_last happened + in LEX::first_lists_tables_same() method which is called by CREATE TABLE + SELECT implementation as part of LEX::unlink_first_table(), which temporary + excludes table list element for table being created from the query table + list before handling SELECT part. + + LEX::first_lists_tables_same() tries to ensure that global table list of + the statement starts with the first table list element from the first + statement select. To do this it moves such table list element to the head + of the global table list. If this table happens to be last directly-used + table for the statement, query_tables_own_last marker is pointing to it. + Since this marker was not updated when table list element was moved we + ended up with all tables except the first table separated by it as if + they were not directly used by statement (i.e. belonged to prelocked + tables list). + + This fix changes code of LEX::first_lists_tables_same() to update + query_tables_own_last marker in cases when it points to the table + being moved. It is set to the table which precedes table being moved + in this case. + +commit 27dfa58cb07c6e58c2b58a673e18b7b824516c13 +Merge: f470c10 a0738f7 +Author: Neha Kumari +Date: Mon Jul 25 21:20:52 2016 +0530 + + Merge branch 'mysql-5.5' into mysql-5.6 + And fixed conflicts. + +commit a0738f703e20b5530fe319f47fc1e5c8ad9e9667 +Author: Neha Kumari +Date: Mon Jul 25 20:34:20 2016 +0530 - Bug #21983865 UNEXPECTED DEADLOCK WITH INNODB_AUTOINC_LOCK_MODE=0 + BUG#23509275 :DBUG_PRINT in THD::decide_logging_format prints incorrectly, access out-of-bound Problem: - ======= - This bug involves multiple thread waiting for AUTOINC_LOCK for the table - and it leads to deadlock. Deadlock is happening because the count of - the nodes visited exceeds the threshold limit(10^6). - - - Marking the subtree visited logic in the current deadlock search - algorithm having some issue respect to table level lock. - - - While traversing the lock wait queue and if it reaches the current waiting - lock then we mark the subtree as visited. - - - In row level lock, we are traversing from the head of the queue and eventually - we will reach the current waiting lock in the lock wait queue. - - - But in table level lock, we are traversing from the tail of the queue, - we will never reach the current waiting lock in the lock wait queue. + In debug builds, there is a chance that an out-of-bounds + read is performed when tables are locked in + LTM_PRELOCKED_UNDER_LOCK_TABLES mode. It can happen because + the debug code uses enum values as index for an array of + mode descriptions, but it only takes into consideration 3 + out of 4 of the enum values. Fix: - ==== - - To fix visiting subtree logic for table level lock, - traverse from the head of the lock wait queue. + This patch fixes it by implementing a getter for the enum which + returns a string representation of the enum, + effectively removing the out-of-bounds read. - Reviewed-by: Debarun Banerjee - RB: 12147 + Moreover, it also fixes the lock mode descriptions that + would be print out in debug builds. -commit da80d9f74b85fd82c07edcada999ab08cb5f3365 -Author: Aditya A -Date: Thu Mar 31 11:06:10 2016 +0530 +commit f470c103b29250cedfd3a124f6f0dedcebab3e57 +Merge: bc715f5 9c7309c +Author: Thayumanavar S +Date: Mon Jul 25 07:50:47 2016 +0200 - Revert "Bug #21133329 HANGING "SYSTEM LOCK" WHEN EXECUTING "FLUSH TABLE ... FOR EXPORT"" - - This reverts commit 66b7e4af49af98f8d38caf1f52f6ab0dc1cc99ab. + Merge branch 'mysql-5.5' into mysql-5.6 -commit 8b75c0cfc90d3242f12621737a0d805479487151 -Author: Tor Didriksen -Date: Wed Mar 23 11:25:50 2016 +0100 +commit 9c7309c0d5bc1d663df96a730076d88f625a322c +Author: Thayumanavar S +Date: Mon Jul 25 06:43:16 2016 +0100 - Bug#22932576 MYSQL5.6 DOES NOT BUILD ON SOLARIS12 + BUG#23703568 - IS CLIENT LIBRARY SUPPOSED TO RETRY EINTR INDEFINITELY OR NOT - Followup patch: extend CMAKE_SHARED_LIBRARY_CXX_FLAGS with necessary libraries. + Commit#ebd24626ca38e7fa1e3da2acdcf88540be70fabe obsoleted the THREAD and + THREAD_SAFE_CLIENT preprocessor symbols. This is not removed in the + sql/net_serv.cc thereby the code that retries on EINTR became dead code. + Remove the THREAD_SAFE_CLIENT preprocessor directive form sql/net_serv.cc. + Also check errno for EINTR only if there is an error in preceding read call. -commit 66b7e4af49af98f8d38caf1f52f6ab0dc1cc99ab -Author: Aditya A -Date: Wed Mar 30 11:52:21 2016 +0530 - - Bug #21133329 HANGING "SYSTEM LOCK" WHEN EXECUTING "FLUSH TABLE ... FOR EXPORT" - PROBLEM - -------- - 1. ibuf_contarct_in background() function is trying to merge - all pages related to a certain table (which contains no record). - while in background heavy DML operations are happening. - When contracting the pages in ibuf_merge_space() we call - ibuf_get_merge_pages() to get the pages to be merged.This function - call returns the volume ( in bytes) of pages to be merged. - In our case , the returned volume is zero since there are no pages - to be merged ,but we increment the volume returned by 1 . - 2. This volume is returned to ibuf_contract_in_background() which - assumes that some pages have been merged since the volume - returned is greater than zero and waits it reach the required - number of pages to be merged and gets stuck in the loop. - - FIX - - 1. The reason we increment the volume by 1 ,is becasue for delete - marked records the volume returned is zero and the logic in - ibuf_merge_space() is such that acutual merging happens only - if volume returned is non zero. - 2. To fix this we have changed the logic to merge only if the - number of pages returned is greater than zero.We return zero - to the ibuf_contarct_in background() when there are no pages - to merge which enables it break the loop. - - [ Reviewed by Jimmy #rb12209 ] - -commit e6b0330ff682370ed88f32ed27b57e193d79cf65 -Merge: 947f31f 40fe95b -Author: Nisha Gopalakrishnan -Date: Wed Mar 30 09:52:59 2016 +0530 +commit bc715f5e681ebafa2bf468ba030bcf2ee18f54a7 +Merge: ab63d81 39a1f7d +Author: Arun Kuruvila +Date: Fri Jul 22 13:17:41 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit 40fe95b3ee7b3c369ebd66fe37e3081362188112 -Author: Nisha Gopalakrishnan -Date: Wed Mar 23 12:59:22 2016 +0530 - - BUG#22986277: DELETE-BUG22594514 UNSTABLE ON PB2 - - Follow up patch to fix the PB2 test failure - pushed as part of bug#22594514 - -commit 947f31fa0efd82a527389a81e960b2b85d6acf2e -Author: Venkatesh Duggirala -Date: Tue Mar 22 15:02:37 2016 +0530 +commit 39a1f7d8f19300c1e0f49f5db983b94ce3ae1854 +Author: Arun Kuruvila +Date: Fri Jul 22 13:15:32 2016 +0530 - Bug#21697821 RELAYLOG.LOG_LOCK IS NOT RELEASED IN - AN ERROR CASE (IN NEXT_EVENT() ) + Bug #23295288: HANDLE_FATAL_SIGNAL (SIG=11) IN + GET_SERVER_FROM_TABLE_TO_CACHE - Fixing post push pb2 failures - -commit 23c7b8de221aded8df23b97103d94715b65f3ae9 -Author: Tor Didriksen -Date: Thu Mar 17 16:45:26 2016 +0100 - - Bug#22932576 MYSQL5.6 DOES NOT BUILD ON SOLARIS12 + Description:- Server received SIG11 in the function, + "get_server_from_table_to_cache()". - For Sun Studio we must build with -std=c++03 - We must also remove this hack - Since Sun Studio depends on seeing __attribute__ ((__weakref__)) - in order to generate correct code. + Analysis:- Defining a server with a blank name is not + handled properly. - Fix: sed -i -e 's/__attribute__/MY_ATTRIBUTE/g' `cat ` - -commit c48a9246f3784b8cc4cc01a9c6fc612b8b1675d4 -Author: Georgi Kodinov -Date: Mon Mar 21 15:01:14 2016 +0200 - - Addendum to the fix for bug #20085672: fixed the changelog year + Fix:- Modified "get_server_from_table_to_cache()" to + take care of blank server name. -commit 2253722387d2bd69853655e8a179770d9f936ff9 -Author: Georgi Kodinov -Date: Mon Mar 14 18:10:45 2016 +0200 +commit ab63d814c81a50d586fff7b57dfe07ac10758333 +Author: Sujatha Sivakumar +Date: Fri Jul 22 10:55:25 2016 +0530 - Bug #20085672: CRYPTIC ERROR WHEN FAILING TO UNLOAD A DYNAMIC LIBRARY + Bug#22510353: UNNECESSARY USING TEMPORARY FOR UPDATE - When the server loads a plugin it searches for globals of the - plugin services the plugin may be using. If found it expects a version - in these globals, checks the version and if it matches replaces it with a - pointer to the server function implementing the service. - It does not save these versions and thus does not restore them when - unloading the plugin, as it expects that the dynamic library will go away. - However if the same shared library also exports UDF functions the reference - count to it may not be zero and UNINSTALL PLUGIN will not actually unload - the shared library. - So the next INSTALL PLUGIN will find the shared library, but will fail when - checking the service versions since these are already replaced by the server - function pointers. + Problem: + ======= + when the binlog_row_image is FULL, we set read_set and + write_set all before update. This leads to setting + used_key_is_modified true, which lead to mysql_update use + temporary at last. Actually there is no need to use + temporary in most cases. The root cause is that we set + read_set and write_set too early. - Fixed by accepting the relevant server function pointer as a valid value for - the version in addition to the actual version as checked currently. + Analysis: + ========= + As reported in problem description table's read_set and + write_set are set earlier. + 'mark_columns_per_binlog_row_image' is the function call + which sets these read and write sets. But this is called + at an earlier stage during execution and in the case of + binlog_row_image=FULL it will set all the bits of read and + write sets. This will make the update query to think that + a key is being modified by the existing update query. Even + though it is not modifying the key field. This will force + the update query to use a temporary table even though it may + not be required. The same problem exists even in the case of + binlog_row_image=NOBLOB. This problem is specific to single + table updates. + + This issue is not present in the case of multi table update. + As in the multi table update case, the check for 'used key + is modified or not' is done before marking + read_set/write_set as per binlog_row_image. Hence binary log + specific bits are not influencing query to use temporary + table. - Test case added. - -commit c562688a1bdf408ce10db9d52954d56169b5ad7f -Author: Venkatesh Duggirala -Date: Mon Mar 21 12:17:03 2016 +0530 - - Bug#21697821 RELAYLOG.LOG_LOCK IS NOT RELEASED IN AN ERROR CASE (IN NEXT_EVENT()) - - Problem: In an error case, relaylog.log_lock acquired by SQL thread is not - released which is causing all threads, which are looking to acquire - the lock, are hanging. - - Analysis: In next_event() function which is called by SQL thread to read - the next even from the relay log, we have - next_event(Rli *) - { - .... - if (hot_log) - acquire relay_log.log_lock - ..... - - /* - As there is no guarantee that the relay is open (for example, an I/O - error during a write by the slave I/O thread may have closed it), we - have to test it. - */ - if (!my_b_inited(cur_log)) - goto err; - - As you can see above, we are acquiring relay_log.log_lock but in case error - (relay log is closed by I/O thread) we are simply returning from the next_event - without releasing the lock. Hence any thread which will try to acquire - relaylog.log_lock afterwards will wait forever. - - Fix: In the above said error case, release the relaylog.log_lock before leaving - the function. - -commit 5eb2e9e1b9d0b48940dad65a970223e055d8efad -Author: Parveez Baig -Date: Fri Mar 18 17:49:42 2016 +0530 - - BUG 16207800 - RPL_GTID_LOGS_WITHOUT_ROTATE_OR_STOP_EVENT TEST FAILS OCCASIONALLY ON WIN - - The test is failing on windows occasionally with Timeout in - include/wait_for_slave_param.inc and some time it fails with - symptom wrong value for slave parameter in - include/check_slave_param.inc - - In the clean up phase of test we will revert GTID-based - replication to the normal files and positions based replication - using the change master to command by only specifying - MASTER_AUTO_POSITION=0.But the docmentation of replication says - If we need to revert from GTID-based replication to replication - based on files and positions, we must use one or both of the - options MASTER_LOG_FILE and MASTER_LOG_POS together with - MASTER_AUTO_POSITION = 0 in the CHANGE MASTER TO command. - - Fix: Added the variable MASTER_LOG_FILE and MASTER_LOG_POS - in change master to command by getting its value from the - master using show master status. + Fix: + === + Implemented single table update to follow the same mechanism + that multi table update follows. i.e Mark the columns in + table's read_set/write_set as the binlog_row_image after the + 'used key is modified or not' decision is taken. -commit 9278e07732ae4037d025a5b0b85c3675d95ab405 -Merge: 634fee0 883f1fb -Author: Jon Olav Hauglid -Date: Thu Mar 17 14:34:57 2016 +0100 +commit 926ec9c656582bcbc2e69087eeb11a1c197ac717 +Merge: 74cfd7c 8235e91 +Author: Sreeharsha Ramanavarapu +Date: Fri Jul 22 07:35:57 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit 883f1fb45198db82ca8d10bb97eb6d31421714ed -Author: Jon Olav Hauglid -Date: Thu Mar 17 14:32:08 2016 +0100 +commit 8235e9184c5a0cab08d74dfa4d47ff0faed8c31a +Author: Sreeharsha Ramanavarapu +Date: Fri Jul 22 07:33:43 2016 +0530 - Bug#22594514: HANDLE_FATAL_SIGNAL (SIG=11) IN - UNIQUE::~UNIQUE | SQL/UNIQUES.CC:355 + Bug #23280699: MYSQLD GOT SIGNAL 11 IN IS_NULL ON SELECT + FROM I_S - Disable test case for now due to instability. + Issue: + ------ + There is a difference in the field type created when the + following DDLs are used: - Reviewed-by: Erlend Dahl - -commit 634fee0eef61c5d241a31f3b3d90da7fc5922d9d -Author: Erlend Dahl -Date: Thu Mar 17 13:25:27 2016 +0100 - - Fix file permissions - -commit 6f5a2f730f89c083944e468a4165cf12a7af0f87 -Merge: c7902f6 85545a8 -Author: Nisha Gopalakrishnan -Date: Thu Mar 17 09:00:22 2016 +0530 - - Merge branch 'mysql-5.5' into mysql-5.6 - -commit 85545a896ae5b2e414076118a18f72c3eb97695f -Author: Nisha Gopalakrishnan -Date: Mon Mar 14 15:20:21 2016 +0530 - - BUG#22594514: HANDLE_FATAL_SIGNAL (SIG=11) IN - UNIQUE::~UNIQUE | SQL/UNIQUES.CC:355 + 1) CREATE TABLE t0 AS SELECT NULL; + 2) CREATE TABLE t0 AS SELECT GREATEST(NULL,NULL); - Analysis - ======== + The first statement creates field of type Field_string and + the second one creates a field of type Field_null. - Enabling the sort_buffer_size with a large value - can cause operations utilizing the sort buffer - like DELETE as mentioned in the bug report to - fail. 5.5 and 5.6 versions reports OOM error - while in 5.7+, the server crashes. - - While initializing the mem_root for the sort buffer - tree, the block size for the mem_root is determined - from the 'sort_buffer_size' value. This unsigned - long value is typecasted to unsigned int, hence - it becomes zero. Further block_size computation - while initializing the mem_root results in a very - large block_size value. Hence while trying to - allocate a block during the DELETE operation, - an OOM error is reported. In case of 5.7+, the PFS - instrumentation for memory allocation, overshoots - the unsigned value and allocates a block of just - one byte. While trying to free the block of the - mem_root, the original block_size is used. This - triggers the crash since the server tries to free - unallocated memory. + This creates a problem when the query mentioned in this bug + is used. Since the null_ptr is calculated differently for + Field_null. - Fix: - ==== - In order to restrict usage of such unreasonable - sort_buffer_size, the typecast of block size - to 'unsigned int' is removed and hence reports - OOM error across all versions for sizes - exceeding unsigned int range. + Solution: + --------- + When there is a function returning null in the select list + as mentioned above, the field should be of type + Field_string. + + This was fixed in 5.6+ as part of Bug#14021323. This is a + backport to mysql-5.5. + + An incorrect comment in innodb_bug54044.test has been + corrected in all versions. -commit c7902f6227f6d626e796653569c33f05c73beba0 -Author: Shaohua Wang -Date: Thu Mar 17 10:03:24 2016 +0800 +commit 74cfd7cfab19ea0d0bc52c7cab3616ef8165f4bc +Merge: efd84b4 a9911d0 +Author: Chaithra Gopalareddy +Date: Tue Jul 19 08:04:29 2016 +0530 + + Merge branch 'mysql-5.5' into mysql-5.6 + +commit a9911d0b31e874c7ad6d3f088e755e04beb49e38 +Author: Chaithra Gopalareddy +Date: Tue Jul 19 08:03:09 2016 +0530 - BUG#13651665 INNODB MAY BE UNABLE TO LOAD TABLE DEFINITION AFTER RENAME + Bug#23280059: ITEM_ROW::ILLEGAL_METHOD_CALL(CONST CHAR*): + ASSERTION `0' FAILED ON SELECT AREA - If there are 2 record one deleted, one is not, but with same table id, - but separate on 2 pages, the current table load scheme might prematurely - stopped at the deleted rec, and did not move to next page to locate the - undeleted, thus false fully thought the table is deleted. + Problem: + Optimizer tries to get the points to calculate area without + checking the return value of uint4korr for 0 "points". As a + result server exits. - Reviewed-by: Marko Mäkelä - Reviewed-by: Jimmy Yang - RB: 12090 + Solution: + Check the return value from uint4korr(). -commit ee21813dcd86208759eadbdd8bbf45a788fb81c3 +commit efd84b4bcba3516e15699be833f1292670144e22 Author: Thirunarayanan Balathandayuthapani -Date: Tue Mar 15 11:08:29 2016 +0530 +Date: Fri Jul 15 14:39:37 2016 +0530 - Bug #22679185 INVALID INNODB FTS DOC ID DURING INSERT + Bug #23475211 COMBINING ALTER OPERATIONS TRIGGERS TABLE REBUILD Problem: ======= - Insert into an InnoDB table that contains a FULLTEXT KEY and a - FTS_DOC_ID column fail when the specified FTS_DOC_ID value as high. - Currently the behaviour is consecutive doc_ids difference in the - table should not exceed 10000. + Inplace alter algorithm determines the table to be rebuild if the table + undergoes row format change, key block size if handler flag contains only + change table create option. If alter with inplace ignore flag operations and change table create options then it leads to table rebuild operation. Solution: ======== - Increased the limit for consecutive doc_ids difference to 65535. + During the check for rebuild, ignore the inplace ignore flag and check for + table create options. Reviewed-by: Jimmy Yang - RB: 11997 + Reviewed-by: Marko Makela + RB: 13172 -commit ae7f3782de58ee5655f12833f1f61e8bdd7a9803 -Author: Shaohua Wang -Date: Mon Mar 14 20:34:14 2016 +0800 +commit 47c0fdfced7f5bb5e1ae9af9bdaeb369b5f8583b +Author: Georgi Kodinov +Date: Thu Jul 7 15:37:25 2016 +0300 - Followup:BUG#18614604 EMPTY/ZERO STATISTICS FOR IMPORTED TABLESPACE UNTIL - EXPLICIT ANALYZE TABLE + Bug #23747899: @@BASEDIR SYSVAR VALUE NOT NORMALIZED IF SET THROUGH + THE COMMAND LINE/INI FILE - Fix i_innodb.innodb_fts_import failure on pb2. - -commit 5af92be677671cde22c8574a56710992f42cee5d -Author: Tor Didriksen -Date: Wed Mar 9 13:46:54 2016 +0100 - - Bug#22888420 CONCAT_WS: ASSERTION FAILED: !S.USES_BUFFER_OWNED_BY(THIS) + The system variable basedir is of type charptr and can take command line + arguments. This means that it operates on a "char *" global and every time + a command line argument is supplied a new string buffer is allocated and + assigned to this variable. + The global char * used for this variable is called base_dir_ptr. + Originally this char * is assigned to a global char array called base_dir. + And the rest of the server code uses the base_dir array directly. + But setting a new value on the command line set the base_dir_ptr to the + something different than the base_dir. + Then, in mysqld_get_one_option(), the contents of that new buffer is copied + to base_dir, but the base_dir_ptr is not reset to point back to base_dir. + Thus it does not reflect the subsequent processing done directly over base_dir + This processing includes (among other things) normalization of the path + separators used. As a result the system variable returns the data exactly as + set on the command line or through the INI file instead of the normalized + value that's stored in base_dir. + + Note that no other code uses base_dir_ptr, thus the problem is constrained + to the value returned for @@basedir. + + Fixed by reseting base_dir_ptr to point to base_dir in mysqld_get_one_option + right after copying the new value back. This makes it similar to the other + path containing system variables. - Problem: assert in dbug mode. - Fix: Do not assert if there is nothing to append. + Test case added. -commit 670dbc6f007ee32b90577fdde65d6da77989a875 -Author: Shaohua Wang -Date: Mon Mar 14 12:01:31 2016 +0800 +commit ae4d5db19450380f448b0763d97a3a98277704b4 +Author: Srikanth B R +Date: Mon Jul 11 10:14:23 2016 +0530 - BUG#18614604 EMPTY/ZERO STATISTICS FOR IMPORTED TABLESPACE UNTIL - EXPLICIT ANALYZE TABLE + Bug#23060553 MTR SPAWNS ONLY ONE WORKER WHEN USING --PARALLEL=AUTO + ON WINDOWS - Backport rb#7428 to 5.6. - -commit a61b5224f59f77a0ee245c7a42df136a80e7a204 -Merge: 4b47067 2dd8b6e -Author: Sujatha Sivakumar -Date: Mon Mar 7 18:21:34 2016 +0530 - - Merge branch 'mysql-5.5' into mysql-5.6 - -commit 2dd8b6e00b7a9cb00c2c84f69b049d537c9fd388 -Author: Sujatha Sivakumar -Date: Mon Mar 7 18:19:26 2016 +0530 - - Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS - FULL - Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO - THREAD WAITS FOR DISK SPACE + Follow-up fix: Restoring original file permissions of mysql-test-run.pl - Fixing a post push test issue. + Reviewed by: Erlend Dahl -commit 4b47067d6e74a5493d0604afed3d852d03092771 -Author: Aditya A -Date: Thu Mar 3 17:02:53 2016 +0530 +commit b587f4a2531b20b4f15792527fa0b46fc5138dde +Author: Srikanth B R +Date: Fri Jul 8 14:33:55 2016 +0530 - Bug# 22865112 LACK OF HTONLL CHECK CAUSE MYSQ5.6.30/5.7.12 BUILD FAILURE ON OS X - - PROBLEM - ------- + Bug#23060553 MTR SPAWNS ONLY ONE WORKER WHEN USING --PARALLEL=AUTO + ON WINDOWS - Build failure in some mac machines due to redefinition of htonll function. + Issue: + ------ + MTR does not compute the number of parallel workers when the option + --parallel=auto is given on Windows and spawns only one worker by + default. An additional check throttles the number of parallel workers + to one in case of virtual machines on Windows. - FIX - --- - Introduced a check to not redefine htonll if OS provides htonll function. + Fix: + ---- + Number of parallel MTR workers is now set to the number of processors + using the environment variable 'NUMBER_OF_PROCESSORS' when --parallel + =auto is given on Windows. Also, a line which checks if a Windows machine + is a virtual one and sets the --parallel value to one has been removed + as Windows VM's are stable with huge amount of threads these days. + + Reviewed-by: + Sayantan Dutta + RB #12523 -commit ab5db1fccdbd4afd63acf186ccdbb9ba5ee215bc -Author: Sreeharsha Ramanavarapu -Date: Thu Mar 3 14:21:24 2016 +0530 +commit 04969317137464074556c969950d3782f551fbdf +Author: Balasubramanian Kandasamy +Date: Tue Jul 5 17:08:37 2016 +0530 - Bug #22187476: LOCK IN SHARED MODE AND FOR UPDATE CAUSE TOO - MANY CRASHES. + Bug#23736787 - YUM UPDATE FAIL FROM 5.5.51(COMUNITY/COMMERCIAL) TO 5.6.32(COMUNITY/COMMERCIAL) - Post-push fix for mysql-5.6. + Remove mysql_config from client sub-package - 1) Accidentally reverted a previous change in opt_range.cc. - This has been corrected. - 2) The result file's explain output belonged to 5.7. This - has also been corrected. + (cherry picked from commit 45c4bfa0f3f1c70756591f48710bb3e76ffde9bc) -commit 39851d64940fdaa2d8281cef37b0cdb90634d041 -Author: Sreeharsha Ramanavarapu -Date: Thu Mar 3 07:59:34 2016 +0530 +commit c45124a0b582d57ac6cf20b786e0c643ec9ce941 +Author: Shaohua Wang +Date: Thu Jul 7 11:41:31 2016 +0800 - Bug #22187476: LOCK IN SHARED MODE AND FOR UPDATE CAUSE TOO - MANY CRASHES. + Followup: BUG#23479595 SEGMENTATION FAULT WHEN SELECT FTS INDEX + TABLES IN INFORMATION SCHEMA - ISSUE: - ------ - The problem occurs in the following circumstances: - 1) When two or more parallel connections result in a - deadlock detected by INNODB. - 2) The query that causes the deadlock is a - "SELECT ...GROUP BY ....FOR UPDATE" that uses loose - index scan. + BUG#23742339 FAILING ASSERTION: SYM_NODE->TABLE != NULL - SOLUTION: - --------- - When INNODB returns "HA_ERR_LOCK_DEADLOCK" (or any other - error code), this is not handled by the part of range - optimizer that deals with loose index scan. This error - code will now be passed on to the calling function. + Problem: When we access fts aux tables in information schema,the + fts aux tables are dropped by DROP DATABASE in another session. + + Solution: Block DDL by s-locking dict_operation_lock. + + Reviewed-by: Jimmy Yang + RB: 13264 -commit bab190af774afc10bd57b6e44b8536238d510087 -Merge: 060bcee d138c73 -Author: Sreeharsha Ramanavarapu -Date: Thu Mar 3 06:44:31 2016 +0530 +commit 308f9b88e75f6179add209a2fe6affdb49b7c2ee +Merge: 140d08c 45c4bfa +Author: Balasubramanian Kandasamy +Date: Tue Jul 5 17:12:56 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit d138c733e4c4a7fd667c3b7826a908727031fe6f -Author: Sreeharsha Ramanavarapu -Date: Thu Mar 3 06:42:12 2016 +0530 +commit 45c4bfa0f3f1c70756591f48710bb3e76ffde9bc +Author: Balasubramanian Kandasamy +Date: Tue Jul 5 17:08:37 2016 +0530 - Bug #18740222: CRASH IN GET_INTERVAL_INFO WITH WEIRDO - INTERVALS - - ISSUE: - ------ - Some string functions return one or a combination of the - parameters as their result. Here the resultant string's - charset could be incorrectly set to that of the chosen - parameter. - - This results in incorrect behavior when an ascii string is - expected. + Bug#23736787 - YUM UPDATE FAIL FROM 5.5.51(COMUNITY/COMMERCIAL) TO 5.6.32(COMUNITY/COMMERCIAL) - SOLUTION: - --------- - Since an ascii string is expected, val_str_ascii should - explicitly convert the string. - - Part of the fix is a backport of Bug#22340858 for mysql-5.5 - and mysql-5.6. + Remove mysql_config from client sub-package -commit 060bceee57d187f08559c968b44944550074aa45 -Merge: 1627275 0bd6719 -Author: Shishir Jaiswal -Date: Tue Mar 1 13:09:18 2016 +0530 +commit 140d08cf1d8c7dee9cd3531860c0853af372bbca +Merge: f262d5a 43320b7 +Author: Kailasnath Nagarkar +Date: Fri Jul 1 12:05:29 2016 +0530 Merge branch 'mysql-5.5' into mysql-5.6 -commit 0bd6719c227addd89f997c358dee5bab90b4ad7f -Author: Shishir Jaiswal -Date: Tue Mar 1 13:05:14 2016 +0530 - - Bug#19920049 - MYSQLD_MULTI MISLEADING WHEN MY_PRINT_DEFAULTS - IS NOT FOUND - - DESCRIPTION - =========== - If script mysqld_multi and utility my_print_defaults are in - the same folder (not included in $PATH) and the former is - made to run, it complaints that the mysqld binary is absent - eventhough the binary exists. - - ANALYSIS - ======== - We've a subroutine my_which() mimicking the behaviour of - POSIX "which" command. Its current behaviour is to check - for a given argument as follows: - - Step 1: Assume the argument to be a command having full - fledged absolute path. If it exists "as-is", return the - argument (which will be pathname), else proceed to Step 2. - - Step 2: Assume the argument to be a plain command with no - aboslute path. Try locating it in all of the paths - (mentioned in $PATH) one by one. If found return the - pathname. If found nowhere, return NULL. - - Currently when my_which(my_print_defaults) is called, it - returns from Step 1 (since utlity exists in current - folder) and doesn't proceed to Step 2. This is wrong since - the returned value is same as the argument i.e. - 'my_print_default' which defies the purpose of this - subroutine whose job is to return a pathname either in Step - 1 or Step 2. - - Later when the utility is executed in subroutine - defaults_for_group(), it evaluates to NULL and returns the - same. This is because the plain command 'my_print_defaults - {options} ...' would execute properly only if - my_print_defaults exists in one of the paths (in $PATH). In - such a case, in the course of the flow it looks onto the - variable $mysqld_found which comes out to be NULL and - hence ethe error. - - In this case, call to my_which should fail resulting in - script being aborted and thus avoiding this mess. - - FIX - === - This utility my_print_defaults should be tested only in - Step 2 since it does not have an absolute path. Thus added - a condition in Step 1 so that is gets executed iff not - called for my_print_defaults thus bypassing it to proceed - to Step 2 where the check is made for various paths (in - $PATH) - -commit 1627275002327acdcb5083aa6c6846688f4a591d -Author: Sujatha Sivakumar -Date: Tue Mar 1 12:44:53 2016 +0530 +commit 43320b72495cccc24fbe2a83fe4844f93bac6a08 +Author: Kailasnath Nagarkar +Date: Fri Jul 1 12:01:27 2016 +0530 - Bug#21507981: REPLICATION POSITION LOST AFTER CRASH ON MTS - CONFIGURED SLAVE + Bug #23296299 : HANDLE_FATAL_SIGNAL (SIG=11) IN + MY_TOSORT_UTF32 - Problem: - ======== - Enable MTS along with crash-safe replication tables. Make - sure that the server is busily inserting data with multiple - threads in parallel. Shutdown mysqld uncleanly (kill -9 or - power off server without notice). - - Now users are restarting the server with - --relay-log-recovery=1 to recover the crashed slave. - - This results in following error: - ================================ - 2015-06-24 13:49:03 3895 [ERROR] --relay-log-recovery cannot - be executed when the slave was stopped with an error or - killed in MTS mode; consider using RESET SLAVE or restart - the server with --relay-log-recovery = 0 followed by - START SLAVE UNTIL SQL_AFTER_MTS_GAPS. - - i.e relay-log-recovery will not work in MTS mode. - - Manual steps that are followed to fix this issue: - ================================================ - 1) The server has to be restarted with –-relay-log-recovery= 0. - 2) Execute START SLAVE UNTIL SQL_AFTER_MTS_GAPS. - This step will ensure that gaps are filled and the slave will - stop at this point. - 3) Restart the slave server with ‘relay-log-recovery=1’. + This patch is specific for mysql-5.5 - Analysis: - ======== - The above mentioned process involves manual intervention. - This needs to be automated. + ISSUE: When a charater that is larger than possible to + handle is passed to function my_tosort_utf32(), it results + in segmentation fault. In the scenario mentioned in the bug + AES_ENCRYPT function is used which returns large value. + This value is further passed to my_tosort_utf32 function. + This causes to cross array bound for array uni_plane, + resulting in segment violation. - Fix: - ==== - During crash recovery if gaps are present in MTS execution - then START SLAVE UNTIL SQL_AFTER_MTS_GAPS is invoked - implicitly and the gaps are filled. Once slave reaches this - gap less consistent state it will stop. Then initialize the - Receiver thread's positions to the latest Applier thread's - positions and discard the old relay logs as we do in the - case of single threaded slave mode. - - This recovery process may not work if MTS has stopped due to - an error during an earlier session in that case appropriate - error message will be printed. Users will have to eliminate - the route cause of the error and restart the recovery - process. + SOLUTION: + This issue has got addressed in 5.6 onward releases + through worklog 2673. + + The fix is similar backport of that. + Check for maximum character before accessing the array + uni_plane. In addition to function my_tosort_utf32, the + same potential problem is also present in functions + my_tolower_utf16, my_toupper_utf16, my_tosort_utf16, + my_tolower_utf32, my_toupper_utf32, my_tosort_unicode, + my_tolower_utf8mb4 and my_toupper_utf8mb4. + Fixed these functions as well. -commit 749b93441d49b923319b4a9e08a179443373672c -Merge: 2c6e095 c3dcf8e -Author: Sujatha Sivakumar -Date: Tue Mar 1 12:32:15 2016 +0530 +commit f262d5acb164853acf3d9f6a1a296b6f6eb00e40 +Merge: 86b2481 09f089b +Author: Christopher Powers +Date: Thu Jun 30 20:57:29 2016 +0200 Merge branch 'mysql-5.5' into mysql-5.6 -commit c3dcf8e5a8fdea776258c43a0e4a9e5ca5d5772a -Author: Sujatha Sivakumar -Date: Tue Mar 1 12:29:51 2016 +0530 +commit 09f089bfb9f1b95a2da6129313b3e03229620810 +Author: Christopher Powers +Date: Thu Jun 30 20:42:29 2016 +0200 - Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS - FULL - Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO - THREAD WAITS FOR DISK SPACE - - Problem: - ======== - Currently SHOW SLAVE STATUS blocks if IO thread waits for - disk space. This makes automation tools verifying - server health block on taking relevant action. Finally this - will create SHOW SLAVE STATUS piles. + Bug#14111584 PB2: PERFSCHEMA.AGGREGATE FAILS ON PB2 SPORADICALLY - Analysis: - ========= - SHOW SLAVE STATUS hangs on mi->data_lock if relay log write - is waiting for free disk space while holding mi->data_lock. - mi->data_lock is needed to protect the format description - event (mi->format_description_event) which is accessed by - the clients running FLUSH LOGS and slave IO thread. Note - relay log writes don't need to be protected by - mi->data_lock, LOCK_log is used to protect relay log between - IO and SQL thread (see MYSQL_BIN_LOG::append_event). The - code takes mi->data_lock to protect - mi->format_description_event during relay log rotate which - might get triggered right after relay log write. + Permanently removed test case perfschema.aggregate. - Fix: - ==== - Release the data_lock just for the duration of writing into - relay log. - - Made change to ensure the following lock order is maintained - to avoid deadlocks. - - data_lock, LOCK_log - - data_lock is held during relay log rotations to protect - the description event. - -commit 2c6e095afac0b6272c8ee7c2290bf4ad80ebe4e3 -Merge: d77441f 7c955a2 -Author: Venkatesh Duggirala -Date: Tue Mar 1 11:59:16 2016 +0530 - - Merge branch 'mysql-5.5' into mysql-5.6 - -commit 7c955a2f134178afdb5644c324c5c64a7ee3c370 -Author: Venkatesh Duggirala -Date: Tue Mar 1 11:58:45 2016 +0530 - - BUG#17018343 SLAVE CRASHES WHEN APPLYING ROW-BASED BINLOG ENTRIES IN CASCADING - REPLICATION - - Problem: In RBR mode, merge table updates are not successfully applied on a cascading - replication. - - Analysis & Fix: Every type of row event is preceded by one or more table_map_log_events - that gives the information about all the tables that are involved in the row - event. Server maintains the list in RPL_TABLE_LIST and it goes through all the - tables and checks for the compatibility between master and slave. Before - checking for the compatibility, it calls 'open_tables()' which takes the list - of all tables that needs to be locked and opened. In RBR, because of the - Table_map_log_event , we already have all the tables including base tables in - the list. But the open_tables() which is generic call takes care of appending - base tables if the list contains merge tables. There is an assumption in the - current replication layer logic that these tables (TABLE_LIST type objects) are always - added in the end of the list. Replication layer maintains the count of - tables(tables_to_lock_count) that needs to be verified for compatibility check - and runs through only those many tables from the list and rest of the objects - in linked list can be skipped. But this assumption is wrong. - open_tables()->..->add_children_to_list() adds base tables to the list immediately - after seeing the merge table in the list. - - For eg: If the list passed to open_tables() is t1->t2->t3 where t3 is merge - table (and t1 and t2 are base tables), it adds t1'->t2' to the list after t3. - New table list looks like t1->t2->t3->t1'->t2'. It looks like it added at the - end of the list but that is not correct. If the list passed to open_tables() - is t3->t1->t2 where t3 is merge table (and t1 and t2 are base tables), the new - prepared list will be t3->t1'->t2'->t1->t2. Where t1' and t2' are of - TABLE_LIST objects which were added by add_children_to_list() call and replication - layer should not look into them. Here tables_to_lock_count will not help as the - objects are added in between the list. - - Fix: After investigating add_children_list() logic (which is called from open_tables()), - there is no flag/logic in it to skip adding the children to the list even if the - children are already included in the table list. Hence to fix the issue, a - logic should be added in the replication layer to skip children in the list by - checking whether 'parent_l' is non-null or not. If it is children, we will skip 'compatibility' - check for that table. - - Also this patch is not removing 'tables_to_lock_count' logic for the performance issues - if there are any children at the end of the list, those can be easily skipped directly by - stopping the loop with tables_to_lock_count check. + The Performance Schema is generally lock-free, allowing for + race conditions that might arise from multi-threaded operation + which occasionally results in temporary and/or minor variances + when aggregating statistics. This test needs to be redesigned + to accommodate such variances. -commit d77441fa6cbbbba262a735097d65f87f3b498d46 -Merge: cb420b9 94f1a3a -Author: Arun Kuruvila -Date: Tue Mar 1 10:21:28 2016 +0530 +commit 86b24811e1a1f75d6580a2cb2e7aba8499df7b3c +Merge: 32df078 722ab50 +Author: Balasubramanian Kandasamy +Date: Mon Jun 27 12:52:39 2016 +0530 - Merge branch 'mysql-5.5' into mysql-5.6 + Raise version number after cloning 5.6.32 -commit 94f1a3a8e479a50ad7d5ed2b226afeebfaf652f5 -Author: Arun Kuruvila -Date: Tue Mar 1 10:17:25 2016 +0530 - - Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BE - FOUND - - Description:- Failure during the validation of CA - certificate path which is provided as an option for 'ssl-ca' - returns two different errors for YaSSL and OPENSSL. - - Analysis:- 'ssl-ca', option used for specifying the ssl ca - certificate path. Failing to validate this certificate with - OPENSSL returns an error, "ERROR 2026 (HY000): SSL - connection error: SSL_CTX_set_default_verify_paths failed". - While YASSL returns "ERROR 2026 (HY000): SSL connection - error: ASN: bad other signature confirmation". Error - returned by the OPENSSL is correct since - "SSL_CTX_load_verify_locations()" returns 0 (in case of - OPENSSL) for the failure and sets error as - "SSL_INITERR_BAD_PATHS". In case of YASSL, - "SSL_CTX_load_verify_locations()" returns an error number - which is less than or equal to 0 in case of error. Error - numbers for YASSL is mentioned in the file, - 'extra/yassl/include/openssl/ssl.h'(line no : 292). Also - 'ssl-ca' does not accept tilde home directory path - substitution. - - Fix:- The condition which checks for the error in the - "SSL_CTX_load_verify_locations()" is changed in order to - accommodate YASSL as well. A logic is written in - "mysql_ssl_set()" in order accept the tilde home directory - path substitution for all ssl options. - -commit cb420b9a9772e3895ee28500ffd84b3bca9298b2 -Merge: bafbd56 1c7233b -Author: Bjorn Munch -Date: Mon Feb 29 14:03:11 2016 +0100 - - Raise version number after cloning 5.6.30 - -commit 1c7233b1ba850cfea003f472c6c62a05009f77be -Author: Bjorn Munch -Date: Mon Feb 29 13:58:41 2016 +0100 +commit 722ab50d01a795895a6ca8f13b3409b1919f16c0 +Author: Balasubramanian Kandasamy +Date: Mon Jun 27 12:48:57 2016 +0530 - Raise version number after cloning 5.5.49 + Raise version number after cloning 5.5.51 diff -Nru mysql-5.6-5.6.31/Docs/INFO_SRC mysql-5.6-5.6.33/Docs/INFO_SRC --- mysql-5.6-5.6.31/Docs/INFO_SRC 2016-05-16 22:25:40.000000000 +0000 +++ mysql-5.6-5.6.33/Docs/INFO_SRC 2016-08-26 11:31:24.000000000 +0000 @@ -1,7 +1,7 @@ -commit: 933465dc2c781fafb7d56511cf91cb6c54fe3d6c -date: 2016-05-16 13:46:29 +0200 -build-date: 2016-05-17 00:19:58 +0200 -short: 933465d -branch: mysql-5.6.31-release +commit: 259f2ca9477c92b6e9a91cb37dac19d24ffcacd9 +date: 2016-08-26 13:01:54 +0200 +build-date: 2016-08-26 13:22:54 +0200 +short: 259f2ca +branch: mysql-5.6.33-release -MySQL source 5.6.31 +MySQL source 5.6.33 diff -Nru mysql-5.6-5.6.31/extra/my_print_defaults.c mysql-5.6-5.6.33/extra/my_print_defaults.c --- mysql-5.6-5.6.31/extra/my_print_defaults.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/extra/my_print_defaults.c 2016-08-26 11:22:35.000000000 +0000 @@ -172,7 +172,7 @@ org_argv= argv; args_used= get_defaults_options(argc, argv, &defaults, &extra_defaults, - &group_suffix, &login_path); + &group_suffix, &login_path, FALSE); /* Copy defaults-xxx arguments & program name */ count=args_used+1; diff -Nru mysql-5.6-5.6.31/include/my_default.h mysql-5.6-5.6.33/include/my_default.h --- mysql-5.6-5.6.31/include/my_default.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/include/my_default.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,16 +33,18 @@ my_bool my_getopt_is_args_separator(const char* arg); int get_defaults_options(int argc, char **argv, char **defaults, char **extra_defaults, - char **group_suffix, char **login_path); + char **group_suffix, char **login_path, + my_bool found_no_defaults); int my_load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv, const char ***); -int check_file_permissions(const char *file_name); +int check_file_permissions(const char *file_name, my_bool is_login_file); int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); int my_search_option_files(const char *conf_file, int *argc, char ***argv, uint *args_used, Process_option_func func, void *func_ctx, - const char **default_directories); + const char **default_directories, + my_bool is_login_file, my_bool found_no_defaults); void free_defaults(char **argv); void my_print_default_files(const char *conf_file); void print_defaults(const char *conf_file, const char **groups); diff -Nru mysql-5.6-5.6.31/include/myisam.h mysql-5.6-5.6.33/include/myisam.h --- mysql-5.6-5.6.31/include/myisam.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/include/myisam.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -426,12 +426,13 @@ int chk_key(MI_CHECK *param, MI_INFO *info); int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend); int mi_repair(MI_CHECK *param, register MI_INFO *info, - char * name, int rep_quick); -int mi_sort_index(MI_CHECK *param, register MI_INFO *info, char * name); + char * name, int rep_quick, my_bool no_copy_stat); +int mi_sort_index(MI_CHECK *param, register MI_INFO *info, char * name, + my_bool no_copy_stat); int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, - const char * name, int rep_quick); + const char * name, int rep_quick, my_bool no_copy_stat); int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, - const char * name, int rep_quick); + const char * name, int rep_quick, my_bool no_copy_stat); int change_to_newfile(const char * filename, const char * old_ext, const char * new_ext, myf myflags); int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type, diff -Nru mysql-5.6-5.6.31/include/my_sys.h mysql-5.6-5.6.33/include/my_sys.h --- mysql-5.6-5.6.31/include/my_sys.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/include/my_sys.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -84,6 +84,7 @@ #define MY_RESOLVE_LINK 128 /* my_realpath(); Only resolve links */ #define MY_HOLD_ORIGINAL_MODES 128 /* my_copy() holds to file modes */ #define MY_REDEL_MAKE_BACKUP 256 +#define MY_REDEL_NO_COPY_STAT 512 /* my_redel() doesn't call my_copystat() */ #define MY_SEEK_NOT_DONE 32 /* my_lock may have to do a seek */ #define MY_DONT_WAIT 64 /* my_lock() don't wait if can't lock */ #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */ diff -Nru mysql-5.6-5.6.31/man/comp_err.1 mysql-5.6-5.6.33/man/comp_err.1 --- mysql-5.6-5.6.31/man/comp_err.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/comp_err.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBcomp_err\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBCOMP_ERR\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBCOMP_ERR\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -44,7 +44,7 @@ normally is run automatically when MySQL is built\&. It compiles the errmsg\&.sys file from the text file located at -sql/share/errmsg\&.txt +sql/share/errmsg\-utf8\&.txt in MySQL source distributions\&. .PP \fBcomp_err\fR @@ -162,7 +162,7 @@ \fB\-F \fR\fB\fIfile_name\fR\fR .sp The name of the input file\&. The default is -\&.\&./sql/share/errmsg\&.txt\&. +\&.\&./sql/share/errmsg\-utf8\&.txt\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/innochecksum.1 mysql-5.6-5.6.33/man/innochecksum.1 --- mysql-5.6-5.6.31/man/innochecksum.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/innochecksum.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBinnochecksum\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBINNOCHECKSUM\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBINNOCHECKSUM\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/msql2mysql.1 mysql-5.6-5.6.33/man/msql2mysql.1 --- mysql-5.6-5.6.31/man/msql2mysql.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/msql2mysql.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmsql2mysql\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMSQL2MYSQL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMSQL2MYSQL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/myisamchk.1 mysql-5.6-5.6.33/man/myisamchk.1 --- mysql-5.6-5.6.31/man/myisamchk.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/myisamchk.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmyisamchk\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYISAMCHK\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYISAMCHK\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/myisam_ftdump.1 mysql-5.6-5.6.33/man/myisam_ftdump.1 --- mysql-5.6-5.6.31/man/myisam_ftdump.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/myisam_ftdump.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmyisam_ftdump\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYISAM_FTDUMP\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYISAM_FTDUMP\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/myisamlog.1 mysql-5.6-5.6.33/man/myisamlog.1 --- mysql-5.6-5.6.31/man/myisamlog.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/myisamlog.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmyisamlog\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYISAMLOG\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYISAMLOG\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/myisampack.1 mysql-5.6-5.6.33/man/myisampack.1 --- mysql-5.6-5.6.31/man/myisampack.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/myisampack.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmyisampack\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYISAMPACK\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYISAMPACK\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/my_print_defaults.1 mysql-5.6-5.6.33/man/my_print_defaults.1 --- mysql-5.6-5.6.31/man/my_print_defaults.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/my_print_defaults.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmy_print_defaults\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMY_PRINT_DEFAULTS" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMY_PRINT_DEFAULTS" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql.1 mysql-5.6-5.6.33/man/mysql.1 --- mysql-5.6-5.6.31/man/mysql.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -438,16 +438,13 @@ \fIcharset_name\fR as the default character set for the client and connection\&. .sp -A common issue that can occur when the operating system uses -utf8 -or another multibyte character set is that output from the -\fBmysql\fR -client is formatted incorrectly, due to the fact that the MySQL client uses the -latin1 -character set by default\&. You can usually fix such issues by using this option to force the client to use the system character set instead\&. +This option can be useful if the operating system uses one character set and the +\fBmysql\fR +client by default uses another\&. In this case, output may be formatted incorrectly\&. You can usually fix such issues by using this option to force the client to use the system character set instead\&. .sp -See -Section\ \&10.5, \(lqCharacter Set Configuration\(rq, for more information\&. +For more information, see +Section\ \&10.1.5, \(lqConnection Character Sets and Collations\(rq, and +Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&. .RE .sp .RS 4 @@ -554,7 +551,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. .RE .sp .RS 4 @@ -1165,7 +1162,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -1189,7 +1201,7 @@ For additional discussion regarding use of the sha256_password plugin, including how to get the RSA public key, see -Section\ \&6.4.1.4, \(lqThe SHA-256 Authentication Plugin\(rq\&. +Section\ \&6.5.1.4, \(lqThe SHA-256 Authentication Plugin\(rq\&. .sp This option is available only if MySQL was built using OpenSSL\&. It was added in MySQL 5\&.6\&.6 under the name \fB\-\-server\-public\-key\fR @@ -1318,7 +1330,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 @@ -2808,7 +2820,7 @@ uses it as a search string to access server\-side help from the contents of the MySQL Reference Manual\&. The proper operation of this command requires that the help tables in the mysql database be initialized with help topic information (see -Section\ \&5.1.10, \(lqServer-Side Help\(rq)\&. +Section\ \&5.1.9, \(lqServer-Side Help\(rq)\&. .PP If there is no match for the search string, the search fails: .sp diff -Nru mysql-5.6-5.6.31/man/mysqlaccess.1 mysql-5.6-5.6.33/man/mysqlaccess.1 --- mysql-5.6-5.6.31/man/mysqlaccess.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlaccess.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlaccess\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLACCESS\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLACCESS\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqladmin.1 mysql-5.6-5.6.33/man/mysqladmin.1 --- mysql-5.6-5.6.31/man/mysqladmin.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqladmin.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqladmin\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLADMIN\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLADMIN\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -781,7 +781,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. .RE .sp .RS 4 @@ -1017,7 +1017,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -1104,7 +1119,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysqlbinlog.1 mysql-5.6-5.6.33/man/mysqlbinlog.1 --- mysql-5.6-5.6.31/man/mysqlbinlog.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlbinlog.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlbinlog\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLBINLOG\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLBINLOG\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1077,7 +1077,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE diff -Nru mysql-5.6-5.6.31/man/mysqlbug.1 mysql-5.6-5.6.33/man/mysqlbug.1 --- mysql-5.6-5.6.31/man/mysqlbug.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlbug.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlbug\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLBUG\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLBUG\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqlcheck.1 mysql-5.6-5.6.33/man/mysqlcheck.1 --- mysql-5.6-5.6.31/man/mysqlcheck.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlcheck.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlcheck\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLCHECK\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLCHECK\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -560,7 +560,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) .sp This option was added in MySQL 5\&.6\&.28\&. .RE @@ -866,7 +866,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -945,7 +960,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysql_client_test.1 mysql-5.6-5.6.33/man/mysql_client_test.1 --- mysql-5.6-5.6.31/man/mysql_client_test.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_client_test.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_client_test\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL .\" Language: English .\" -.TH "\FBMYSQL_CLIENT_TEST" "1" "05/16/2016" "MySQL" "MySQL Database System" +.TH "\FBMYSQL_CLIENT_TEST" "1" "08/25/2016" "MySQL" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_config.1 mysql-5.6-5.6.33/man/mysql_config.1 --- mysql-5.6-5.6.31/man/mysql_config.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_config.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_config\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_CONFIG\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_CONFIG\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_config_editor.1 mysql-5.6-5.6.33/man/mysql_config_editor.1 --- mysql-5.6-5.6.31/man/mysql_config_editor.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_config_editor.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_config_editor\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_CONFIG_EDIT" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_CONFIG_EDIT" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_convert_table_format.1 mysql-5.6-5.6.33/man/mysql_convert_table_format.1 --- mysql-5.6-5.6.31/man/mysql_convert_table_format.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_convert_table_format.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_convert_table_format\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_CONVERT_TAB" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_CONVERT_TAB" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqld.8 mysql-5.6-5.6.33/man/mysqld.8 --- mysql-5.6-5.6.31/man/mysqld.8 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqld.8 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqld\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLD\FR" "8" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLD\FR" "8" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqld_multi.1 mysql-5.6-5.6.33/man/mysqld_multi.1 --- mysql-5.6-5.6.31/man/mysqld_multi.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqld_multi.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqld_multi\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLD_MULTI\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLD_MULTI\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -56,7 +56,7 @@ group used for starting \fBmysqld\fR\&. (See, for example, Section\ \&2.10.5, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see -Section\ \&5.5, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&. +Section\ \&5.6, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&. .PP To invoke \fBmysqld_multi\fR, use the following syntax: @@ -434,7 +434,7 @@ what you are doing\&. Starting multiple servers with the same data directory does \fInot\fR give you extra performance in a threaded system\&. See -Section\ \&5.5, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&. +Section\ \&5.6, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysqld_safe.1 mysql-5.6-5.6.33/man/mysqld_safe.1 --- mysql-5.6-5.6.31/man/mysqld_safe.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqld_safe.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqld_safe\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLD_SAFE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLD_SAFE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -225,7 +225,11 @@ \fB\-\-malloc\-lib=[\fR\fB\fIlib_name\fR\fR\fB]\fR The name of the library to use for memory allocation instead of the system malloc() -library\&. Any library can be used by specifying its path name, but there is a shortcut form to enable use of the +library\&. As of MySQL 5\&.6\&.33, the option value must be one of the directories +/usr/lib, +/usr/lib64, +/usr/lib/i386\-linux\-gnu, or +/usr/lib/x86_64\-linux\-gnu\&. Prior to MySQL 5\&.6\&.33, any library can be used by specifying its path name, but there is a shortcut form to enable use of the tcmalloc library that is shipped with binary MySQL distributions for Linux in MySQL 5\&.6\&. It is possible that the shortcut form will not work under certain configurations, in which case you should specify a path name instead\&. .if n \{\ @@ -381,6 +385,8 @@ cannot find the server, use the \fB\-\-ledir\fR option to indicate the path name to the directory where the server is located\&. +.sp +As of MySQL 5\&.6\&.33, this option can be given only on the command line and not in an option file\&. .RE .sp .RS 4 @@ -412,6 +418,8 @@ in the ledir directory\&. +.sp +As of MySQL 5\&.6\&.33, this option can be given only on the command line and not in an option file\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysqldump.1 mysql-5.6-5.6.33/man/mysqldump.1 --- mysql-5.6-5.6.31/man/mysqldump.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqldump.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqldump\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLDUMP\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLDUMP\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -462,7 +462,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) .sp This option was added in MySQL 5\&.6\&.28\&. .RE @@ -615,7 +615,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -648,7 +663,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysqldumpslow.1 mysql-5.6-5.6.33/man/mysqldumpslow.1 --- mysql-5.6-5.6.31/man/mysqldumpslow.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqldumpslow.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqldumpslow\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLDUMPSLOW\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLDUMPSLOW\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_find_rows.1 mysql-5.6-5.6.33/man/mysql_find_rows.1 --- mysql-5.6-5.6.31/man/mysql_find_rows.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_find_rows.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_find_rows\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_FIND_ROWS\F" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_FIND_ROWS\F" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_fix_extensions.1 mysql-5.6-5.6.33/man/mysql_fix_extensions.1 --- mysql-5.6-5.6.31/man/mysql_fix_extensions.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_fix_extensions.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_fix_extensions\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_FIX_EXTENSI" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_FIX_EXTENSI" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqlhotcopy.1 mysql-5.6-5.6.33/man/mysqlhotcopy.1 --- mysql-5.6-5.6.31/man/mysqlhotcopy.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlhotcopy.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlhotcopy\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLHOTCOPY\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLHOTCOPY\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqlimport.1 mysql-5.6-5.6.33/man/mysqlimport.1 --- mysql-5.6-5.6.31/man/mysqlimport.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlimport.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlimport\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLIMPORT\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLIMPORT\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -308,7 +308,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) .sp This option was added in MySQL 5\&.6\&.28\&. .RE @@ -651,7 +651,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -716,7 +731,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysql_install_db.1 mysql-5.6-5.6.33/man/mysql_install_db.1 --- mysql-5.6-5.6.31/man/mysql_install_db.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_install_db.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_install_db\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_INSTALL_DB\" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_INSTALL_DB\" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_plugin.1 mysql-5.6-5.6.33/man/mysql_plugin.1 --- mysql-5.6-5.6.31/man/mysql_plugin.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_plugin.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_plugin\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_PLUGIN\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_PLUGIN\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -57,7 +57,7 @@ automatically\&. For additional control over plugin activation, use \fB\-\-\fR\fB\fIplugin_name\fR\fR options named for specific plugins, as described in -Section\ \&5.1.8.1, \(lqInstalling and Uninstalling Plugins\(rq\&. +Section\ \&5.5.2, \(lqInstalling and Uninstalling Plugins\(rq\&. .PP Each invocation of \fBmysql_plugin\fR diff -Nru mysql-5.6-5.6.31/man/mysql_secure_installation.1 mysql-5.6-5.6.33/man/mysql_secure_installation.1 --- mysql-5.6-5.6.31/man/mysql_secure_installation.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_secure_installation.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_secure_installation\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_SECURE_INST" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_SECURE_INST" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql.server.1 mysql-5.6-5.6.33/man/mysql.server.1 --- mysql-5.6-5.6.31/man/mysql.server.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql.server.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql.server\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL\&.SERVER\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL\&.SERVER\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_setpermission.1 mysql-5.6-5.6.33/man/mysql_setpermission.1 --- mysql-5.6-5.6.31/man/mysql_setpermission.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_setpermission.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_setpermission\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_SETPERMISSI" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_SETPERMISSI" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqlshow.1 mysql-5.6-5.6.33/man/mysqlshow.1 --- mysql-5.6-5.6.31/man/mysqlshow.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlshow.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlshow\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLSHOW\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLSHOW\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -340,7 +340,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) .sp This option was added in MySQL 5\&.6\&.28\&. .RE @@ -546,7 +546,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -615,7 +630,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysqlslap.1 mysql-5.6-5.6.33/man/mysqlslap.1 --- mysql-5.6-5.6.31/man/mysqlslap.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqlslap.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqlslap\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQLSLAP\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQLSLAP\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -573,7 +573,7 @@ Enable the mysql_clear_password cleartext authentication plugin\&. (See -Section\ \&6.4.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. +Section\ \&6.5.1.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&. .RE .sp .RS 4 @@ -957,7 +957,22 @@ .ps -1 .br Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see -Section\ \&6.4.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +Section\ \&6.5.1.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&. +.sp .5v +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +This option is deprecated and will be removed in a future release\&. As of MySQL 5\&.7\&.5, it is always enabled and attempting to disable it produces an error\&. .sp .5v .RE .RE @@ -1017,7 +1032,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysql-stress-test.pl.1 mysql-5.6-5.6.33/man/mysql-stress-test.pl.1 --- mysql-5.6-5.6.31/man/mysql-stress-test.pl.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql-stress-test.pl.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql-stress-test.pl\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL .\" Language: English .\" -.TH "\FBMYSQL\-STRESS\-TE" "1" "05/16/2016" "MySQL" "MySQL Database System" +.TH "\FBMYSQL\-STRESS\-TE" "1" "08/25/2016" "MySQL" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysqltest.1 mysql-5.6-5.6.33/man/mysqltest.1 --- mysql-5.6-5.6.31/man/mysqltest.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysqltest.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysqltest\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL .\" Language: English .\" -.TH "\FBMYSQLTEST\FR" "1" "05/16/2016" "MySQL" "MySQL Database System" +.TH "\FBMYSQLTEST\FR" "1" "08/25/2016" "MySQL" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql-test-run.pl.1 mysql-5.6-5.6.33/man/mysql-test-run.pl.1 --- mysql-5.6-5.6.31/man/mysql-test-run.pl.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql-test-run.pl.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql-test-run.pl\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL .\" Language: English .\" -.TH "\FBMYSQL\-TEST\-RUN\" "1" "05/16/2016" "MySQL" "MySQL Database System" +.TH "\FBMYSQL\-TEST\-RUN\" "1" "08/25/2016" "MySQL" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -166,7 +166,7 @@ with anything in between\&. In the latter case, the pattern match is not anchored to the beginning of the test name, so it also matches names such as xmainytesta\&. .PP -From MySQL 5\&.7 it is possible to put a list of test names in a file and have +As of MySQL 5\&.7, it is possible to put a list of test names in a file and have \fBmysql\-test\-run\&.pl\fR run those tests, using the option \fB\-\-do\-test\-list=\fR\fB\fIfile\fR\fR\&. The tests should be listed one per line in the file, using the fully qualified name @@ -174,6 +174,14 @@ # indicates a comment and is ignored\&. .PP +As of MySQL 8\&.0, +\fBmysql\-test\-run\&.pl\fR +supports a +\fB\-\-do\-suite\fR +option, which is similar to +\fB\-\-do\-test\fR +but permits specifying entire suites of tests to run\&. +.PP To perform setup prior to running tests, \fBmysql\-test\-run\&.pl\fR needs to invoke @@ -253,8 +261,14 @@ l l l l l l +l l l l. T{ +MTR_BUILD_THREAD +T}:T{ +If set, defines which port number range is used for the server +T} +T{ MTR_MEM T}:T{ If set to anything, will run tests with files in "memory" using tmpfs or @@ -262,20 +276,10 @@ \fB\-\-mem\fR option T} T{ -MTR_PARALLEL -T}:T{ -If set, defines number of parallel threads executing tests\&. Same as - \fB\-\-parallel\fR option -T} -T{ -MTR_BUILD_THREAD -T}:T{ -If set, defines which port number range is used for the server -T} -T{ -MTR_PORT_BASE +MTR_MAX_PARALLEL T}:T{ -If set, defines which port number range is used for the server +If set, defines maximum number of parallel threads if + \fB\-\-parallel=auto\fR is given T} T{ MTR_\fINAME\fR_TIMEOUT @@ -292,6 +296,17 @@ MySQL 5\&.8\&.0\&. T} T{ +MTR_PARALLEL +T}:T{ +If set, defines number of parallel threads executing tests\&. Same as + \fB\-\-parallel\fR option +T} +T{ +MTR_PORT_BASE +T}:T{ +If set, defines which port number range is used for the server +T} +T{ MYSQL_CONFIG_EDITOR T}:T{ Path name to \fBmysql_config_editor\fR binary\&. Supported as @@ -303,6 +318,12 @@ Path name to \fBmysqltest\fR binary T} T{ +MYSQL_TEST_DIR +T}:T{ +Full path to the mysql\-test directory where tests + are being run from +T} +T{ MYSQL_TEST_LOGIN_FILE T}:T{ Path name to login file used by \fBmysql_config_editor\fR\&. @@ -312,6 +333,17 @@ Windows\&. Supported as of MySQL 5\&.6\&.6\&. T} T{ +MYSQL_TMP_DIR +T}:T{ +Path to temp directory used for temporary files during tests +T} +T{ +MYSQLD +T}:T{ +Full path to server executable used in tests\&. Supported as of MySQL + 5\&.5\&.17\&. +T} +T{ MYSQLD_BOOTSTRAP T}:T{ Full path name to \fBmysqld\fR that has all options enabled @@ -322,12 +354,6 @@ Full command line used for initial database setup for this test batch T} T{ -MYSQLD -T}:T{ -Full path to server executable used in tests\&. Supported as of MySQL - 5\&.5\&.17\&. -T} -T{ MYSQLD_CMD T}:T{ Command line for starting server as used in tests, with the minimum set @@ -339,17 +365,6 @@ Path name to the var directory that is used for logs, temporary files, and so forth T} -T{ -MYSQL_TEST_DIR -T}:T{ -Full path to the mysql\-test directory where tests - are being run from -T} -T{ -MYSQL_TMP_DIR -T}:T{ -Path to temp directory used for temporary files during tests -T} .TE .sp 1 .PP @@ -885,15 +900,42 @@ .sp -1 .IP \(bu 2.3 .\} -\fB\-\-do\-test=\fR\fB\fIprefix\fR\fR +\fB\-\-do\-suite=\fR\fB\fIprefix or regex\fR\fR +.sp +Run all test cases from suites having a name that begins with the given +\fIprefix\fR +value or matches the regular expression\&. If the argument matches no existing suites, +\fBmysql\-test\-run\&.pl\fR +aborts\&. +.sp +The argument for the +\fB\-\-do\-suite\fR +option allows more flexible specification of which tests to perform\&. See the description of the +\fB\-\-do\-test\fR +option for details\&. +.sp +The +\fB\-\-do\-suite\fR +option was added in MySQL 8\&.0\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fB\-\-do\-test=\fR\fB\fIprefix or regex\fR\fR .sp Run all test cases having a name that begins with the given \fIprefix\fR -value\&. This option provides a convenient way to run a family of similarly named tests\&. +value or matches the regular expression\&. This option provides a convenient way to run a family of similarly named tests\&. .sp The argument for the \fB\-\-do\-test\fR -option also allows more flexible specification of which tests to perform\&. If the argument contains a pattern metacharacter other than a lone period, it is interpreted as a Perl regular expression and applies to test names that match the pattern\&. If the argument contains a lone period or does not contain any pattern metacharacters, it is interpreted the same way as previously and matches test names that begin with the argument value\&. For example, +option allows more flexible specification of which tests to perform\&. If the argument contains a pattern metacharacter other than a lone period, it is interpreted as a Perl regular expression and applies to test names that match the pattern\&. If the argument contains a lone period or does not contain any pattern metacharacters, it is interpreted the same way as previously and matches test names that begin with the argument value\&. For example, \fB\-\-do\-test=testa\fR matches tests that begin with testa, @@ -1507,8 +1549,26 @@ \fIN\fR parallel threads\&. By default, 1 thread is used\&. Use \fB\-\-parallel=auto\fR -for auto\-setting of -\fIN\fR\&. +to set +\fIN\fR +automatically\&. +.sp +Setting the +MTR_PARALLEL +environment variable to +\fIN\fR +has the same effect as specifying +\fB\-\-parallel=\fR\fB\fIN\fR\fR\&. +.sp +The +MTR_MAX_PARALLEL +environment variable, if set, specifies the maximum number of parallel workers that can be spawned when the +\fB\-\-parallel=auto\fR +option is specified\&. If +\fB\-\-parallel=auto\fR +is not specified, +MTR_MAX_PARALLEL +variable has no effect\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysql_tzinfo_to_sql.1 mysql-5.6-5.6.33/man/mysql_tzinfo_to_sql.1 --- mysql-5.6-5.6.31/man/mysql_tzinfo_to_sql.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_tzinfo_to_sql.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_tzinfo_to_sql\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_TZINFO_TO_S" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_TZINFO_TO_S" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_upgrade.1 mysql-5.6-5.6.33/man/mysql_upgrade.1 --- mysql-5.6-5.6.31/man/mysql_upgrade.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_upgrade.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_upgrade\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_UPGRADE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_UPGRADE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -241,7 +241,7 @@ .PP \fBmysql_upgrade\fR does not upgrade the contents of the help tables\&. For upgrade instructions, see -Section\ \&5.1.10, \(lqServer-Side Help\(rq\&. +Section\ \&5.1.9, \(lqServer-Side Help\(rq\&. .PP By default, \fBmysql_upgrade\fR @@ -706,7 +706,7 @@ Options that begin with \fB\-\-ssl\fR specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See -Section\ \&6.3.9.5, \(lqCommand Options for Secure Connections\(rq\&. +Section\ \&6.4.5, \(lqCommand Options for Secure Connections\(rq\&. .RE .sp .RS 4 diff -Nru mysql-5.6-5.6.31/man/mysql_waitpid.1 mysql-5.6-5.6.33/man/mysql_waitpid.1 --- mysql-5.6-5.6.31/man/mysql_waitpid.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_waitpid.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_waitpid\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_WAITPID\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_WAITPID\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/mysql_zap.1 mysql-5.6-5.6.33/man/mysql_zap.1 --- mysql-5.6-5.6.31/man/mysql_zap.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/mysql_zap.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBmysql_zap\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBMYSQL_ZAP\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBMYSQL_ZAP\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_blob_tool.1 mysql-5.6-5.6.33/man/ndb_blob_tool.1 --- mysql-5.6-5.6.31/man/ndb_blob_tool.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_blob_tool.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_blob_tool\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_BLOB_TOOL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_BLOB_TOOL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -296,8 +296,8 @@ .nf USE test; CREATE TABLE btest ( - c0 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - c1 TEXT, + c0 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + c1 TEXT, c2 BLOB ) ENGINE=NDB; .fi diff -Nru mysql-5.6-5.6.31/man/ndb-common-options.1 mysql-5.6-5.6.33/man/ndb-common-options.1 --- mysql-5.6-5.6.31/man/ndb-common-options.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb-common-options.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: Options Common to MySQL Cluster Programs .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "OPTIONS COMMON TO MY" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "OPTIONS COMMON TO MY" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_config.1 mysql-5.6-5.6.33/man/ndb_config.1 --- mysql-5.6-5.6.31/man/ndb_config.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_config.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_config\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_CONFIG\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_CONFIG\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -940,7 +940,7 @@ .\} .nf shell> \fBndb_config \-\-configinfo \-\-xml\fR -
@@ -952,10 +952,10 @@ type="unsigned" default="0" min="0" max="4294967039"/>
- - \&... @@ -1010,7 +1010,7 @@ .RS 4 .\} .nf - .fi .if n \{\ @@ -1043,7 +1043,7 @@ .RS 4 .\} .nf - .fi .if n \{\ @@ -1169,7 +1169,7 @@ .RS 4 .\} .nf -shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \e +shell> \fB\&./ndb_config \-\-config\-file=usr/local/mysql/cluster\-data/config\&.ini \e \-\-query=hostname,portnumber \-\-fields=: \-\-rows=, \-\-type=ndb_mgmd\fR 192\&.168\&.0\&.179:1186 .fi diff -Nru mysql-5.6-5.6.31/man/ndb_cpcd.1 mysql-5.6-5.6.33/man/ndb_cpcd.1 --- mysql-5.6-5.6.31/man/ndb_cpcd.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_cpcd.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_cpcd\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_CPCD\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_CPCD\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndbd.8 mysql-5.6-5.6.33/man/ndbd.8 --- mysql-5.6-5.6.31/man/ndbd.8 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndbd.8 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndbd\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDBD\FR" "8" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDBD\FR" "8" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_delete_all.1 mysql-5.6-5.6.33/man/ndb_delete_all.1 --- mysql-5.6-5.6.31/man/ndb_delete_all.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_delete_all.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_delete_all\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_DELETE_ALL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_DELETE_ALL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_desc.1 mysql-5.6-5.6.33/man/ndb_desc.1 --- mysql-5.6-5.6.31/man/ndb_desc.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_desc.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_desc\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_DESC\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_DESC\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -171,7 +171,7 @@ \-\- Attributes \-\- name Varchar(20;latin1_swedish_ci) NOT NULL AT=SHORT_VAR ST=MEMORY NDB$TNODE Unsigned [64] PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY -\-\- Indexes \-\- +\-\- Indexes \-\- PRIMARY KEY(NDB$TNODE) \- UniqueHashIndex NDBT_ProgramExit: 0 \- OK .fi @@ -248,7 +248,7 @@ weight_gm INT(11) NOT NULL, PRIMARY KEY pk (id), UNIQUE KEY uk (name) -) TABLESPACE ts_1 STORAGE DISK +) TABLESPACE ts_1 STORAGE DISK ENGINE=NDB; INSERT INTO fish VALUES (\*(Aq\*(Aq,\*(Aqguppy\*(Aq, 35, 2), (\*(Aq\*(Aq,\*(Aqtuna\*(Aq, 2500, 150000), diff -Nru mysql-5.6-5.6.31/man/ndbd_redo_log_reader.1 mysql-5.6-5.6.33/man/ndbd_redo_log_reader.1 --- mysql-5.6-5.6.31/man/ndbd_redo_log_reader.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndbd_redo_log_reader.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndbd_redo_log_reader\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDBD_REDO_LOG_REA" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDBD_REDO_LOG_REA" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_drop_index.1 mysql-5.6-5.6.33/man/ndb_drop_index.1 --- mysql-5.6-5.6.31/man/ndb_drop_index.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_drop_index.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_drop_index\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_DROP_INDEX\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_DROP_INDEX\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -102,7 +102,7 @@ Reading table information for completion of table and column names You can turn off this feature to get a quicker startup with \-A Welcome to the MySQL monitor\&. Commands end with ; or \eg\&. -Your MySQL connection id is 7 to server version: 5\&.6\&.30\-ndb\-7\&.3\&.14 +Your MySQL connection id is 7 to server version: 5\&.6\&.32\-ndb\-7\&.3\&.15 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&. mysql> \fBSHOW TABLES;\fR +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ diff -Nru mysql-5.6-5.6.31/man/ndb_drop_table.1 mysql-5.6-5.6.33/man/ndb_drop_table.1 --- mysql-5.6-5.6.31/man/ndb_drop_table.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_drop_table.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_drop_table\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_DROP_TABLE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_DROP_TABLE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_error_reporter.1 mysql-5.6-5.6.33/man/ndb_error_reporter.1 --- mysql-5.6-5.6.31/man/ndb_error_reporter.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_error_reporter.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_error_reporter\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_ERROR_REPORTE" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_ERROR_REPORTE" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_index_stat.1 mysql-5.6-5.6.33/man/ndb_index_stat.1 --- mysql-5.6-5.6.31/man/ndb_index_stat.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_index_stat.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_index_stat\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_INDEX_STAT\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_INDEX_STAT\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndbinfo_select_all.1 mysql-5.6-5.6.33/man/ndbinfo_select_all.1 --- mysql-5.6-5.6.31/man/ndbinfo_select_all.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndbinfo_select_all.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndbinfo_select_all\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDBINFO_SELECT_AL" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDBINFO_SELECT_AL" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -99,7 +99,7 @@ 8 0 0 1 268435456 0 0 8 0 0 2 268435456 0 0 8 0 0 3 268435456 0 0 -shell> +shell> .fi .if n \{\ .RE diff -Nru mysql-5.6-5.6.31/man/ndb_mgm.1 mysql-5.6-5.6.33/man/ndb_mgm.1 --- mysql-5.6-5.6.31/man/ndb_mgm.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_mgm.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_mgm\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_MGM\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_MGM\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_mgmd.8 mysql-5.6-5.6.33/man/ndb_mgmd.8 --- mysql-5.6-5.6.31/man/ndb_mgmd.8 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_mgmd.8 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_mgmd\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_MGMD\FR" "8" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_MGMD\FR" "8" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndbmtd.8 mysql-5.6-5.6.33/man/ndbmtd.8 --- mysql-5.6-5.6.31/man/ndbmtd.8 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndbmtd.8 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndbmtd\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDBMTD\FR" "8" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDBMTD\FR" "8" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_print_backup_file.1 mysql-5.6-5.6.33/man/ndb_print_backup_file.1 --- mysql-5.6-5.6.31/man/ndb_print_backup_file.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_print_backup_file.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_print_backup_file\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_PRINT_BACKUP_" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_PRINT_BACKUP_" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_print_file.1 mysql-5.6-5.6.33/man/ndb_print_file.1 --- mysql-5.6-5.6.31/man/ndb_print_file.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_print_file.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_print_file\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_PRINT_FILE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_PRINT_FILE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_print_schema_file.1 mysql-5.6-5.6.33/man/ndb_print_schema_file.1 --- mysql-5.6-5.6.31/man/ndb_print_schema_file.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_print_schema_file.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_print_schema_file\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_PRINT_SCHEMA_" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_PRINT_SCHEMA_" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -59,7 +59,7 @@ (and unlike most of the other NDB utilities that are intended to be run on a management server host or to connect to a management server) -\fBndb_schema_backup_file\fR +\fBndb_print_schema_file\fR must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&. Additional Options.PP None\&. diff -Nru mysql-5.6-5.6.31/man/ndb_print_sys_file.1 mysql-5.6-5.6.33/man/ndb_print_sys_file.1 --- mysql-5.6-5.6.31/man/ndb_print_sys_file.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_print_sys_file.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_print_sys_file\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_PRINT_SYS_FIL" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_PRINT_SYS_FIL" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_restore.1 mysql-5.6-5.6.33/man/ndb_restore.1 --- mysql-5.6-5.6.31/man/ndb_restore.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_restore.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_restore\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_RESTORE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_RESTORE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -79,8 +79,6 @@ .TE .sp 1 .PP -Typical options for this utility are shown here: -.PP Normally, when restoring from a MySQL Cluster backup, \fBndb_restore\fR requires at a minimum the @@ -92,6 +90,8 @@ \fB\-b\fR), and \fB\-\-backup_path\fR options\&. +.PP +Typical options for this utility are shown here: .sp .if n \{\ .RS 4 @@ -1447,7 +1447,7 @@ Rebuilding of unique indexes uses disk write bandwidth for redo logging and local checkpointing\&. An insufficient amount of this bandwith can lead to redo buffer overload or log overload errors\&. In such cases you can run \fBndb_restore\fR \fB\-\-rebuild\-indexes\fR -again; the process resumes at the point where the error occurred\&. You can also do this when you have encountered temporarary errors\&. You can repeat execution of +again; the process resumes at the point where the error occurred\&. You can also do this when you have encountered temporary errors\&. You can repeat execution of \fBndb_restore\fR \fB\-\-rebuild\-indexes\fR indefinitely; you may be able to stop such errors by reducing the value of diff -Nru mysql-5.6-5.6.31/man/ndb_select_all.1 mysql-5.6-5.6.33/man/ndb_select_all.1 --- mysql-5.6-5.6.31/man/ndb_select_all.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_select_all.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_select_all\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_SELECT_ALL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_SELECT_ALL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_select_count.1 mysql-5.6-5.6.33/man/ndb_select_count.1 --- mysql-5.6-5.6.31/man/ndb_select_count.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_select_count.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_select_count\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_SELECT_COUNT\" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_SELECT_COUNT\" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_setup.py.1 mysql-5.6-5.6.33/man/ndb_setup.py.1 --- mysql-5.6-5.6.31/man/ndb_setup.py.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_setup.py.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_setup.py\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_SETUP\&.PY\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_SETUP\&.PY\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_show_tables.1 mysql-5.6-5.6.33/man/ndb_show_tables.1 --- mysql-5.6-5.6.31/man/ndb_show_tables.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_show_tables.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_show_tables\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_SHOW_TABLES\F" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_SHOW_TABLES\F" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/ndb_size.pl.1 mysql-5.6-5.6.33/man/ndb_size.pl.1 --- mysql-5.6-5.6.31/man/ndb_size.pl.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_size.pl.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_size.pl\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_SIZE\&.PL\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_SIZE\&.PL\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -113,9 +113,9 @@ .RS 4 .\} .nf -perl ndb_size\&.pl [\-\-database={\fIdb_name\fR|ALL}] [\-\-hostname=\fIhost\fR[:\fIport\fR]] [\-\-socket=\fIsocket\fR] \e - [\-\-user=\fIuser\fR] [\-\-password=\fIpassword\fR] \e - [\-\-help|\-h] [\-\-format={html|text}] \e +perl ndb_size\&.pl [\-\-database={\fIdb_name\fR|ALL}] [\-\-hostname=\fIhost\fR[:\fIport\fR]] [\-\-socket=\fIsocket\fR] \e + [\-\-user=\fIuser\fR] [\-\-password=\fIpassword\fR] \e + [\-\-help|\-h] [\-\-format={html|text}] \e [\-\-loadqueries=\fIfile_name\fR] [\-\-savequeries=\fIfile_name\fR] .fi .if n \{\ @@ -178,7 +178,7 @@ 4\&.1 5\&.0 5\&.1 Fixed Overhead DM/Row 12 12 16 NULL Bytes/Row 4 4 4 - DataMemory/Row 96 96 48 + DataMemory/Row 96 96 48 (Includes overhead, bitmap and indexes) Varsize Overhead DM/Row 0 0 8 Varsize NULL Bytes/Row 0 0 4 diff -Nru mysql-5.6-5.6.31/man/ndb_waiter.1 mysql-5.6-5.6.33/man/ndb_waiter.1 --- mysql-5.6-5.6.31/man/ndb_waiter.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/ndb_waiter.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBndb_waiter\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBNDB_WAITER\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBNDB_WAITER\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/perror.1 mysql-5.6-5.6.33/man/perror.1 --- mysql-5.6-5.6.31/man/perror.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/perror.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBperror\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBPERROR\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBPERROR\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/replace.1 mysql-5.6-5.6.33/man/replace.1 --- mysql-5.6-5.6.31/man/replace.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/replace.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBreplace\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBREPLACE\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBREPLACE\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/resolveip.1 mysql-5.6-5.6.33/man/resolveip.1 --- mysql-5.6-5.6.31/man/resolveip.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/resolveip.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBresolveip\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBRESOLVEIP\FR" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBRESOLVEIP\FR" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/man/resolve_stack_dump.1 mysql-5.6-5.6.33/man/resolve_stack_dump.1 --- mysql-5.6-5.6.31/man/resolve_stack_dump.1 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/man/resolve_stack_dump.1 2016-08-26 11:32:53.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: \fBresolve_stack_dump\fR .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 05/16/2016 +.\" Date: 08/25/2016 .\" Manual: MySQL Database System .\" Source: MySQL 5.6 .\" Language: English .\" -.TH "\FBRESOLVE_STACK_DUM" "1" "05/16/2016" "MySQL 5\&.6" "MySQL Database System" +.TH "\FBRESOLVE_STACK_DUM" "1" "08/25/2016" "MySQL 5\&.6" "MySQL Database System" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mysql-5.6-5.6.31/mysql-test/collections/default.release.done mysql-5.6-5.6.33/mysql-test/collections/default.release.done --- mysql-5.6-5.6.31/mysql-test/collections/default.release.done 2016-05-16 22:26:02.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/collections/default.release.done 2016-08-26 11:32:11.000000000 +0000 @@ -1 +1 @@ -/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/mysql-test/collections/default.release.in +/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/mysql-test/collections/default.release.in diff -Nru mysql-5.6-5.6.31/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-5.6-5.6.33/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test --- mysql-5.6-5.6.31/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2016-08-26 11:22:35.000000000 +0000 @@ -346,7 +346,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) - is not null; + is not null AS Loaded; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR eval select @a like "%#%error_code=0%ROLLBACK\\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%" OR diff -Nru mysql-5.6-5.6.31/mysql-test/include/explain_utils.inc mysql-5.6-5.6.33/mysql-test/include/explain_utils.inc --- mysql-5.6-5.6.31/mysql-test/include/explain_utils.inc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/include/explain_utils.inc 2016-08-26 11:22:35.000000000 +0000 @@ -72,15 +72,11 @@ } } --eval EXPLAIN FORMAT=JSON $query; -if ($validation) { ---disable_query_log ---replace_result $MASTER_MYSOCK MASTER_MYSOCK +--disable_result_log --exec $MYSQL -S $MASTER_MYSOCK -u root -r test -e "EXPLAIN FORMAT=JSON $query;" > $MYSQLTEST_VARDIR/tmp/explain.json ---replace_regex /[-]*// /FILE.[\/\\:_\.0-9A-Za-z]*/Validation:/ ---exec python $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json +--exec perl $MYSQL_TEST_DIR/suite/opt_trace/validate_json.pl $MYSQLTEST_VARDIR/tmp/explain.json --remove_file '$MYSQLTEST_VARDIR/tmp/explain.json' ---enable_query_log -} +--enable_result_log } if ($select) { @@ -107,15 +103,11 @@ } } --eval EXPLAIN FORMAT=JSON $select; -if ($validation) { ---disable_query_log ---replace_result $MASTER_MYSOCK MASTER_MYSOCK +--disable_result_log --exec $MYSQL -S $MASTER_MYSOCK -u root -r test -e "EXPLAIN FORMAT=JSON $select;" > $MYSQLTEST_VARDIR/tmp/explain.json ---replace_regex /[-]*// /FILE.[\/\\:_\.0-9A-Za-z]*/Validation:/ ---exec python $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json +--exec perl $MYSQL_TEST_DIR/suite/opt_trace/validate_json.pl $MYSQLTEST_VARDIR/tmp/explain.json --remove_file '$MYSQLTEST_VARDIR/tmp/explain.json' ---enable_query_log -} +--enable_result_log } } diff -Nru mysql-5.6-5.6.31/mysql-test/include/python_with_json.inc mysql-5.6-5.6.33/mysql-test/include/python_with_json.inc --- mysql-5.6-5.6.31/mysql-test/include/python_with_json.inc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/include/python_with_json.inc 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ ---disable_result_log -write_file $MYSQLTEST_VARDIR/tmp/explain.json; -{ - "table": - { - "id": 1, - "select_type": "SIMPLE", - "table_name": "t1", - "join_type": "index", - "key": "i1", - "key_length": "5", - "rows": 3, - "extra": - [ - "Using index" - ] - } -} -EOF ---require r/python_with_json.require ---replace_regex /[-]*// /FILE.[\/\\:_\.0-9A-Za-z]*/Validation:/ ---exec python $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json ---remove_file '$MYSQLTEST_VARDIR/tmp/explain.json' ---enable_result_log - diff -Nru mysql-5.6-5.6.31/mysql-test/lib/My/SysInfo.pm mysql-5.6-5.6.33/mysql-test/lib/My/SysInfo.pm --- mysql-5.6-5.6.31/mysql-test/lib/My/SysInfo.pm 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/lib/My/SysInfo.pm 2016-08-26 11:22:35.000000000 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -103,6 +103,40 @@ return undef; } +sub _sysctl { + my ($self)= @_; + my $ncpu= `sysctl hw.ncpu 2> /dev/null`; + if ($ncpu eq '') { + return undef; + } + + my $cpuinfo= {}; + $ncpu =~ s/\D//g; + my $list = `sysctl machdep.cpu | grep machdep\.cpu\.[^.]*: 2> /dev/null`; + my @lines= split('\n', $list); + + foreach my $line (@lines) { + # Default value, the actual cpu values can be used to decrease this + # on slower cpus + $cpuinfo->{bogomips}= DEFAULT_BOGO_MIPS; + + my ($statistic, $value)= + $line=~ /machdep\.cpu\.(.*):\s+(.*)/; + $cpuinfo->{$statistic}= $value; + } + + for (1..$ncpu) { + my $temp_cpuinfo = $cpuinfo; + $temp_cpuinfo->{processor}= $_; + push(@{$self->{cpus}}, $temp_cpuinfo); + } + + # At least one cpu should have been found + # if this method worked + if ( $self->{cpus} ) { + return $self; + } +} sub _unamex { my ($self)= @_; @@ -123,6 +157,7 @@ ( \&_cpuinfo, \&_kstat, + \&_sysctl, \&_unamex, ); @@ -162,6 +197,9 @@ # Return the number of cpus found sub num_cpus { + if (IS_WINDOWS) { + return $ENV{NUMBER_OF_PROCESSORS} || 1; + } my ($self)= @_; return int(@{$self->{cpus}}) or confess "INTERNAL ERROR: No cpus in list"; diff -Nru mysql-5.6-5.6.31/mysql-test/mysql-test-run.pl mysql-5.6-5.6.33/mysql-test/mysql-test-run.pl --- mysql-5.6-5.6.31/mysql-test/mysql-test-run.pl 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/mysql-test-run.pl 2016-08-26 11:22:35.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- -# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -398,14 +398,16 @@ for my $limit (2000, 1500, 1000, 500){ $opt_parallel-- if ($sys_info->min_bogomips() < $limit); } - my $max_par= $ENV{MTR_MAX_PARALLEL} || 8; - $opt_parallel= $max_par if ($opt_parallel > $max_par); - $opt_parallel= $num_tests if ($opt_parallel > $num_tests); - $opt_parallel= 1 if (IS_WINDOWS and $sys_info->isvm()); + if(defined $ENV{MTR_MAX_PARALLEL}) { + my $max_par= $ENV{MTR_MAX_PARALLEL}; + $opt_parallel= $max_par if ($opt_parallel > $max_par); + } $opt_parallel= 1 if ($opt_parallel < 1); - mtr_report("Using parallel: $opt_parallel"); } + # Limit parallel workers to number of tests to avoid idle workers + $opt_parallel= $num_tests if ($num_tests > 0 and $opt_parallel > $num_tests); $ENV{MTR_PARALLEL} = $opt_parallel; + mtr_report("Using parallel: $opt_parallel"); if ($opt_parallel > 1 && ($opt_start_exit || $opt_stress)) { mtr_warning("Parallel cannot be used with --start-and-exit or --stress\n" . @@ -1784,9 +1786,13 @@ if ( lc($opt_build_thread) eq 'auto' ) { my $found_free = 0; $build_thread = 300; # Start attempts from here + + my $build_thread_upper = $build_thread + ($opt_parallel > 39 + ? $opt_parallel + int($opt_parallel / 4) + : 49); while (! $found_free) { - $build_thread= mtr_get_unique_id($build_thread, 349); + $build_thread= mtr_get_unique_id($build_thread, $build_thread_upper); if ( !defined $build_thread ) { mtr_error("Could not get a unique build thread id"); } @@ -5881,6 +5887,7 @@ $exe= "strace"; mtr_add_arg($args, "-o"); mtr_add_arg($args, "%s/log/mysqltest.strace", $opt_vardir); + mtr_add_arg($args, "-f"); mtr_add_arg($args, "$exe_mysqltest"); } @@ -6279,6 +6286,7 @@ mtr_add_arg($args, "-o"); mtr_add_arg($args, "%s/log/%s.strace", $opt_vardir, $type); + mtr_add_arg($args, "-f"); mtr_add_arg($args, $$exe); $$exe= "strace"; } diff -Nru mysql-5.6-5.6.31/mysql-test/r/loaddata.result mysql-5.6-5.6.33/mysql-test/r/loaddata.result --- mysql-5.6-5.6.31/mysql-test/r/loaddata.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/r/loaddata.result 2016-08-26 11:22:35.000000000 +0000 @@ -507,7 +507,7 @@ # Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U # CREATE TABLE t1(f1 INT); -SELECT 0xE1BB30 INTO OUTFILE 't1.dat'; +SELECT 0xE1C330 INTO OUTFILE 't1.dat'; LOAD DATA INFILE 't1.dat' IGNORE INTO TABLE t1 CHARACTER SET utf8; DROP TABLE t1; # @@ -532,3 +532,27 @@ Got one of the listed errors SET @@sql_mode= @old_mode; DROP TABLE t1; + +# +# Bug#23080148 - Backport of Bug#20683959. +# Bug#20683959 LOAD DATA INFILE IGNORES A SPECIFIC ROW SILENTLY +# UNDER DB CHARSET IS UTF8. +# +CREATE DATABASE d1 CHARSET latin1; +USE d1; +CREATE TABLE t1 (val TEXT); +LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1; +SELECT COUNT(*) FROM t1; +COUNT(*) +1 +SELECT HEX(val) FROM t1; +HEX(val) +C38322525420406E696F757A656368756E3A20E98198E2889AF58081AEE7B99DE4B88AE383A3E7B99DE69690F58087B3E7B9A7EFBDA8E7B99DEFBDB3E7B99DE78999E880B3E7B8BAEFBDAAE7B9A7E89699E296A1E7B8BAE4BBA3EFBD8CE7B8BAEFBDA9E7B8B2E2889AE38184E7B99DEFBDB3E7B99DE4B88AE383A3E7B99DE69690F58087B3E7B9A7EFBDA8E7B99DEFBDB3E7B99DE5B3A8EFBD84E8ABA0EFBDA8E89C89F580948EE599AAE7B8BAEFBDAAE7B8BAE9A198EFBDA9EFBDB1E7B9A7E581B5E289A0E7B8BAEFBDBEE7B9A7E9A194EFBDA9E882B4EFBDA5EFBDB5E980A7F5808B96E28693E99EABE38287E58F99E7B8BAE58AB1E28691E7B8BAF5808B9AE7828AE98095EFBDB1E7B8BAEFBDAFE7B8B2E288ABE6A89FE89EB3E6BA98F58081ADE88EA0EFBDBAE98095E6BA98F58081AEE89D93EFBDBAE8AD9BEFBDACE980A7F5808B96E28693E7B8BAF580918EE288AAE7B8BAE4B88AEFBC9EE7B8BAE4B99DE28691E7B8BAF5808B96EFBCA0E88DB3E6A68AEFBDB9EFBDB3E981B2E5B3A8E296A1E7B8BAE7A4BCE7828AE88DB3E6A68AEFBDB0EFBDBDE7B8BAA0E7B8BAE88B93EFBDBEE5B899EFBC9E +CREATE DATABASE d2 CHARSET utf8; +USE d2; +CREATE TABLE t1 (val TEXT); +LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1; +ERROR HY000: Invalid utf8 character string: '"RT @niouzechun: \9058\221A' +DROP TABLE d1.t1, d2.t1; +DROP DATABASE d1; +DROP DATABASE d2; diff -Nru mysql-5.6-5.6.31/mysql-test/r/mysqlbinlog.result mysql-5.6-5.6.33/mysql-test/r/mysqlbinlog.result --- mysql-5.6-5.6.31/mysql-test/r/mysqlbinlog.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/r/mysqlbinlog.result 2016-08-26 11:22:35.000000000 +0000 @@ -731,9 +731,8 @@ FLUSH LOGS; SELECT (@a:=LOAD_FILE("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) -IS NOT NULL; -(@a:=LOAD_FILE("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) -IS NOT NULL +IS NOT NULL AS Loaded; +Loaded 1 *** Unsigned server_id 4294967295 is found: 1 *** SET @@global.server_id= 1; diff -Nru mysql-5.6-5.6.31/mysql-test/r/mysql_client_test_qcache.result mysql-5.6-5.6.33/mysql-test/r/mysql_client_test_qcache.result --- mysql-5.6-5.6.31/mysql-test/r/mysql_client_test_qcache.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/r/mysql_client_test_qcache.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,14 @@ +# Bug#22559575 "the statement (1) has no open cursor" pops sometimes with +# prepared+query_cache +# +# Create relevent tables and call C API test cases +# Setup +select VARIABLE_VALUE into @qcache_hit_val1 from +information_schema.GLOBAL_STATUS where VARIABLE_NAME = 'Qcache_hits'; + +#Run C_API test case +select VARIABLE_VALUE into @qcache_hit_val2 from +information_schema.GLOBAL_STATUS where VARIABLE_NAME = 'Qcache_hits'; +SELECT @qcache_hit_val2 - @qcache_hit_val1; +@qcache_hit_val2 - @qcache_hit_val1 +1 diff -Nru mysql-5.6-5.6.31/mysql-test/r/sp-prelocking.result mysql-5.6-5.6.33/mysql-test/r/sp-prelocking.result --- mysql-5.6-5.6.31/mysql-test/r/sp-prelocking.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/r/sp-prelocking.result 2016-08-26 11:22:35.000000000 +0000 @@ -320,3 +320,34 @@ DROP TRIGGER t1_ai; DROP TABLE t1, t2; End of 5.0 tests +# +# Bug#21142859: FUNCTION UPDATING A VIEW FAILS TO FIND TABLE THAT ACTUALLY EXISTS +# +CREATE TABLE t1 SELECT 1 AS fld1, 'A' AS fld2; +CREATE TABLE t2 (fld3 INT, fld4 CHAR(1)); +CREATE VIEW v1 AS SELECT * FROM t1; +CREATE TRIGGER t1_au AFTER UPDATE ON t1 +FOR EACH ROW INSERT INTO t2 VALUES (new.fld1, new.fld2); +CREATE FUNCTION f1() RETURNS INT +BEGIN +UPDATE v1 SET fld2='B' WHERE fld1=1; +RETURN row_count(); +END ! +# Without the patch, an error was getting reported. +SELECT f1(); +f1() +1 +DROP FUNCTION f1; +DROP VIEW v1; +DROP TABLE t1,t2; +# +# Bug #16672723 "CAN'T FIND TEMPORARY TABLE". +# +CREATE FUNCTION f1() RETURNS INT RETURN 1; +CREATE TEMPORARY TABLE tmp1(a INT); +PREPARE stmt1 FROM "CREATE TEMPORARY TABLE tmp2 AS SELECT b FROM (SELECT f1() AS b FROM tmp1) AS t"; +# The below statement failed before the fix. +EXECUTE stmt1; +DROP TEMPORARY TABLES tmp1, tmp2; +DEALLOCATE PREPARE stmt1; +DROP FUNCTION f1; diff -Nru mysql-5.6-5.6.31/mysql-test/r/variables-win.result mysql-5.6-5.6.33/mysql-test/r/variables-win.result --- mysql-5.6-5.6.31/mysql-test/r/variables-win.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/r/variables-win.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,11 @@ +# +# Bug #23747899: @@basedir sysvar value not normalized if set through +# the command line/ini file +# There should be no slashes in @@basedir and just backslashes +# since it's normalized +SELECT +LOCATE('/', @@basedir) <> 0 AS have_slashes, +LOCATE('\\', @@basedir) <> 0 AS have_backslashes; +have_slashes have_backslashes +0 1 +End of the 5.6 tests diff -Nru mysql-5.6-5.6.31/mysql-test/std_data/bug20683959loaddata.txt mysql-5.6-5.6.33/mysql-test/std_data/bug20683959loaddata.txt --- mysql-5.6-5.6.31/mysql-test/std_data/bug20683959loaddata.txt 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/std_data/bug20683959loaddata.txt 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1 @@ +Ã"RT @niouzechun: 遘√繝上ャ繝斐繧ｨ繝ｳ繝牙耳縺ｪ繧薙□縺代ｌ縺ｩ縲√い繝ｳ繝上ャ繝斐繧ｨ繝ｳ繝峨ｄ諠ｨ蜉噪縺ｪ縺願ｩｱ繧偵≠縺ｾ繧顔ｩ肴･ｵ逧↓鞫ょ叙縺励↑縺炊逕ｱ縺ｯ縲∫樟螳溘莠ｺ逕溘蝓ｺ譛ｬ逧↓縺∪縺上＞縺九↑縺＠荳榊ｹｳ遲峨□縺礼炊荳榊ｰｽ縺縺苓ｾ帙＞ diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,58 @@ +DROP TABLE IF EXISTS t1 ; +# READ_ONLY does nothing to SUPER users +# so we use a non-SUPER one: +GRANT CREATE, SELECT, DROP ON *.* TO test@localhost; +connect con1,localhost,test,,test; +connection default; +SET GLOBAL READ_ONLY=1; +connection con1; +CREATE TEMPORARY TABLE t1 (a INT) ENGINE=INNODB; +# Test INSERTS with autocommit being off and on. +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +INSERT INTO t1 VALUES (20); +# Test UPDATES with autocommit being off and on. +BEGIN; +UPDATE t1 SET a=30 WHERE a=10; +COMMIT; +UPDATE t1 SET a=40 WHERE a=20; +connection default; +SET GLOBAL READ_ONLY=0; +# Test scenario where global read_only is enabled in the middle of transaction. +# Test INSERT operations on temporary tables, INSERTs should be successful even +# when global read_only is enabled. +connection con1; +BEGIN; +INSERT INTO t1 VALUES(50); +connection default; +SET GLOBAL READ_ONLY=1; +connection con1; +SELECT @@GLOBAL.READ_ONLY; +@@GLOBAL.READ_ONLY +1 +COMMIT; +connection default; +SET GLOBAL READ_ONLY=0; +# Test UPDATE operations on temporary tables, UPDATEs should be successful even +# when global read_only is enabled. +connection con1; +BEGIN; +UPDATE t1 SET a=60 WHERE a=50; +connection default; +SET GLOBAL READ_ONLY=1; +connection con1; +SELECT @@GLOBAL.READ_ONLY; +@@GLOBAL.READ_ONLY +1 +COMMIT; +SELECT * FROM t1; +a +30 +40 +60 +# Clean up +connection default; +SET GLOBAL READ_ONLY=0; +disconnect con1; +DROP USER test@localhost; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_index.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_index.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_index.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_index.result 2016-08-26 11:22:35.000000000 +0000 @@ -324,5 +324,65 @@ master-bin.000018 # master-bin.000019 # master-bin.000020 # +# Test case11: Bug #20381055SERVER CRASHES IF INDEX FILE IS OPENED BY +SET SESSION debug="d,force_index_file_delete_failure"; +call mtr.add_suppression("Failed to delete the existing index file"); +call mtr.add_suppression("failed to move crash safe index file to index file"); +call mtr.add_suppression("failed to update the index file"); +PURGE BINARY LOGS TO 'master-bin.000014';; +ERROR HY000: I/O error reading log index file +# Test the index file is complete, although is not purged successfully. +# Also this will indicate that binary logging is not disabled. +show binary logs; +Log_name File_size +master-bin.000012 # +master-bin.000013 # +master-bin.000014 # +master-bin.000015 # +master-bin.000016 # +master-bin.000017 # +master-bin.000018 # +master-bin.000019 # +master-bin.000020 # +SET GLOBAL binlog_error_action='IGNORE_ERROR'; +FLUSH LOGS; +ERROR HY000: Can't open file: 'master-bin.000021' (errno: 1 - Operation not permitted) +SHOW BINARY LOGS; +ERROR HY000: You are not using binary logging +show binary logs; +Log_name File_size +master-bin.000012 # +master-bin.000013 # +master-bin.000014 # +master-bin.000015 # +master-bin.000016 # +master-bin.000017 # +master-bin.000018 # +master-bin.000019 # +master-bin.000020 # +master-bin.000021 # +CREATE TABLE t1(i INT); +SET GLOBAL binlog_error_action='IGNORE_ERROR'; +SET SESSION debug="+d,force_index_file_delete_failure"; +SET SESSION debug="+d,force_rotate"; +INSERT INTO t1 VALUES (12); +ERROR HY000: Can't open file: 'master-bin.000022' (errno: 1 - Operation not permitted) +SHOW BINARY LOGS; +ERROR HY000: You are not using binary logging +show binary logs; +Log_name File_size +master-bin.000012 # +master-bin.000013 # +master-bin.000014 # +master-bin.000015 # +master-bin.000016 # +master-bin.000017 # +master-bin.000018 # +master-bin.000019 # +master-bin.000020 # +master-bin.000021 # +master-bin.000022 # +DROP TABLE t1; +# Test case11: Ends SET SESSION debug=""; End of tests diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_killed.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_killed.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_killed.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_killed.result 2016-08-26 11:22:35.000000000 +0000 @@ -100,9 +100,8 @@ *** a proof the query is binlogged with an error *** select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null +is not null AS Loaded; +Loaded 1 select 0 /* must return 0 to mean the killed update is in */; 0 @@ -138,9 +137,8 @@ master-bin.000001 # Query # # COMMIT select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null +is not null AS Loaded; +Loaded 1 select 0 /* must return 0 to mean the killed delete is in */; 0 diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_killed_simulate.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_killed_simulate.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_killed_simulate.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_killed_simulate.result 2016-08-26 11:22:35.000000000 +0000 @@ -5,9 +5,8 @@ update t1 set a=2 /* will be "killed" after work has been done */; select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null +is not null AS Loaded; +Loaded 1 select 1 /* must return 1 as query completed before got killed*/; 1 @@ -24,9 +23,8 @@ master-bin.000001 # Query # # COMMIT select (@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null +is not null AS Loaded; +Loaded 1 select 0 /* must return 0 to mean the killed query is in */; 0 diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_sql_mode.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_sql_mode.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_sql_mode.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_sql_mode.result 2016-08-26 11:22:35.000000000 +0000 @@ -24,9 +24,8 @@ Check Result select (@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) -is not null +is not null AS Loaded; +Loaded 1 *** String sql_mode=0 is found: 0 *** Clean Up diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result --- mysql-5.6-5.6.31/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2016-08-26 11:22:35.000000000 +0000 @@ -442,9 +442,8 @@ flush logs; select (@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output")) -is not null +is not null AS Loaded; +Loaded 1 select @a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%" OR diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test --- mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,90 @@ +# ==== Purpose ==== +# +# Check that DMLs are allowed on temporary tables, when server is in read only +# mode and binary log is enabled with binlog-format being stmt/mixed mode. +# +# ==== Implementation ==== +# +# Start the server with binary log being enabled. Mark the server as read only. +# Create a non-SUPER user and let the user to create a temporary table and +# perform DML operations on that temporary table. DMLs should not be blocked +# with a 'server read-only mode' error. +# +# ==== References ==== +# +# Bug#12818255: READ-ONLY OPTION DOES NOT ALLOW INSERTS/UPDATES ON TEMPORARY +# TABLES +# Bug#14294223: CHANGES NOT ALLOWED TO TEMPORARY TABLES ON READ-ONLY SERVERS +############################################################################### +--source include/have_log_bin.inc +--disable_warnings +DROP TABLE IF EXISTS t1 ; +--enable_warnings + +--enable_connect_log +--echo # READ_ONLY does nothing to SUPER users +--echo # so we use a non-SUPER one: +GRANT CREATE, SELECT, DROP ON *.* TO test@localhost; + +connect (con1,localhost,test,,test); + +connection default; +SET GLOBAL READ_ONLY=1; + +connection con1; +CREATE TEMPORARY TABLE t1 (a INT) ENGINE=INNODB; + +--echo # Test INSERTS with autocommit being off and on. +BEGIN; +INSERT INTO t1 VALUES (10); +COMMIT; +INSERT INTO t1 VALUES (20); + +--echo # Test UPDATES with autocommit being off and on. +BEGIN; +UPDATE t1 SET a=30 WHERE a=10; +COMMIT; +UPDATE t1 SET a=40 WHERE a=20; + +connection default; +SET GLOBAL READ_ONLY=0; + +--echo # Test scenario where global read_only is enabled in the middle of transaction. +--echo # Test INSERT operations on temporary tables, INSERTs should be successful even +--echo # when global read_only is enabled. +connection con1; +BEGIN; +INSERT INTO t1 VALUES(50); + +connection default; +SET GLOBAL READ_ONLY=1; + +connection con1; +SELECT @@GLOBAL.READ_ONLY; +COMMIT; + +connection default; +SET GLOBAL READ_ONLY=0; + +--echo # Test UPDATE operations on temporary tables, UPDATEs should be successful even +--echo # when global read_only is enabled. +connection con1; +BEGIN; +UPDATE t1 SET a=60 WHERE a=50; + +connection default; +SET GLOBAL READ_ONLY=1; + +connection con1; +SELECT @@GLOBAL.READ_ONLY; +COMMIT; + +SELECT * FROM t1; + +--echo # Clean up +connection default; +SET GLOBAL READ_ONLY=0; + +disconnect con1; +DROP USER test@localhost; +--disable_connect_log diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_index.test mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_index.test --- mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_index.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_index.test 2016-08-26 11:22:35.000000000 +0000 @@ -417,6 +417,61 @@ file_exists $MYSQLD_DATADIR/master-bin.000013; file_exists $MYSQLD_DATADIR/master-bin.000014; -eval SET SESSION debug="$old"; +-- echo # Test case11: Bug #20381055SERVER CRASHES IF INDEX FILE IS OPENED BY + # OTHER APPLICATION AND PURGE IS ISSUED. + # This test case test the server behaviour if index file cannot be + # deleted. +SET SESSION debug="d,force_index_file_delete_failure"; + +# Add supressions +call mtr.add_suppression("Failed to delete the existing index file"); +call mtr.add_suppression("failed to move crash safe index file to index file"); +call mtr.add_suppression("failed to update the index file"); + +# When index file cannot be recreated during purge binary logs command, +# it should throw error but it should not disable binary logging. +-- error ER_IO_ERR_LOG_INDEX_READ +-- eval PURGE BINARY LOGS TO 'master-bin.000014'; + +-- echo # Test the index file is complete, although is not purged successfully. +-- echo # Also this will indicate that binary logging is not disabled. +-- source include/show_binary_logs.inc +file_exists $MYSQLD_DATADIR/master-bin.000012; +file_exists $MYSQLD_DATADIR/master-bin.000013; +file_exists $MYSQLD_DATADIR/master-bin.000014; +# When index file cannot be recreated during FLUSH LOGS command, +# it should throw error and binary logging should be disabled. +SET GLOBAL binlog_error_action='IGNORE_ERROR'; +# normalize strerror message for solaris10-sparc-64bit as long as errno is OK +--replace_regex /\.[\\\/]master/master/ /errno: 1 - .*\)/errno: 1 - Operation not permitted)/ +--error ER_CANT_OPEN_FILE +FLUSH LOGS; + +--error ER_NO_BINARY_LOGGING +SHOW BINARY LOGS; +--source include/restart_mysqld.inc +-- source include/show_binary_logs.inc +CREATE TABLE t1(i INT); +SET GLOBAL binlog_error_action='IGNORE_ERROR'; +SET SESSION debug="+d,force_index_file_delete_failure"; +SET SESSION debug="+d,force_rotate"; + +# When index file cannot be recreated during DML command which +# is trying to rotate the binary log, it should throw error and +# binary logging should be disabled. +# normalize strerror message for solaris10-sparc-64bit as long as errno is OK +--replace_regex /\.[\\\/]master/master/ /errno: 1 - .*\)/errno: 1 - Operation not permitted)/ +--error ER_CANT_OPEN_FILE +INSERT INTO t1 VALUES (12); + +--error ER_NO_BINARY_LOGGING +SHOW BINARY LOGS; + +--source include/restart_mysqld.inc +-- source include/show_binary_logs.inc +DROP TABLE t1; +-- echo # Test case11: Ends + +eval SET SESSION debug="$old"; --echo End of tests diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_killed_simulate.test mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_killed_simulate.test --- mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2016-08-26 11:22:35.000000000 +0000 @@ -26,7 +26,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; +is not null AS Loaded; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR let $error_code= `select @a like "%#%error_code=0%" /* must return 1 */`; eval select $error_code /* must return 1 as query completed before got killed*/; @@ -57,7 +57,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; +is not null AS Loaded; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`; eval select $error_code /* must return 0 to mean the killed query is in */; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_killed.test mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_killed.test --- mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_killed.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_killed.test 2016-08-26 11:22:35.000000000 +0000 @@ -303,7 +303,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; +is not null AS Loaded; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`; eval select $error_code /* must return 0 to mean the killed update is in */; @@ -361,7 +361,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) -is not null; +is not null AS Loaded; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`; eval select $error_code /* must return 0 to mean the killed delete is in */; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_sql_mode.test mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_sql_mode.test --- mysql-5.6-5.6.31/mysql-test/suite/binlog/t/binlog_sql_mode.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/binlog/t/binlog_sql_mode.test 2016-08-26 11:22:35.000000000 +0000 @@ -56,7 +56,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval select (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog")) -is not null; +is not null AS Loaded; let $s_mode_unsigned= `select @a like "%@@session.sql_mode=0%" /* must return 0 */`; echo *** String sql_mode=0 is found: $s_mode_unsigned ***; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/r/innodb_bug54044.result mysql-5.6-5.6.33/mysql-test/suite/innodb/r/innodb_bug54044.result --- mysql-5.6-5.6.31/mysql-test/suite/innodb/r/innodb_bug54044.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/r/innodb_bug54044.result 2016-08-26 11:22:35.000000000 +0000 @@ -6,7 +6,8 @@ `IF(NULL IS NOT NULL, NULL, NULL)` binary(0) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DROP TABLE table_54044; -CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL; +CREATE TABLE tmp ENGINE = INNODB +AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL; SHOW CREATE TABLE tmp; Table Create Table tmp CREATE TABLE `tmp` ( diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/r/innodb-index-online-norebuild.result mysql-5.6-5.6.33/mysql-test/suite/innodb/r/innodb-index-online-norebuild.result --- mysql-5.6-5.6.31/mysql-test/suite/innodb/r/innodb-index-online-norebuild.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/r/innodb-index-online-norebuild.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,26 @@ +# INPLACE ALTER WITH INPLACE_IGNORE FLAG AND CHANGE CREATE OPTION +# CHANGE THE COLUMN DEFAULT (INPLACE_IGNORE) +# AND TABLE CHARSET(CHANGE CREATE) +CREATE TABLE t1( +id INT PRIMARY KEY, +f1 INT NOT NULL DEFAULT 0)ENGINE=INNODB; +INSERT INTO t1 VALUES(1, 2); +ALTER TABLE t1 MODIFY COLUMN f1 INT NOT NULL DEFAULT 0, +DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; +DROP TABLE t1; +# CHANGE THE STORAGE TYPE OF COLUMN(INPLACE IGNORE) +# AND TABLE CHARSET(CHANGE CREATE) +CREATE TABLE t1( +id INT STORAGE DISK)ENGINE=INNODB; +INSERT INTO t1 values(1); +ALTER TABLE t1 MODIFY COLUMN id INT STORAGE MEMORY, +DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; +DROP TABLE t1; +# RENAME THE TABLE(INPLACE IGNORE) +# AND CHANGE TABLE CHARSET(CHANGE CREATE) +CREATE TABLE t1( +f1 INT NOT NULL, +f2 INT NOT NULL)ENGINE=INNODB; +INSERT INTO t1 VALUES(1, 2); +ALTER TABLE t1 RENAME t2, DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; +DROP TABLE t2; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/r/monitor.result mysql-5.6-5.6.33/mysql-test/suite/innodb/r/monitor.result --- mysql-5.6-5.6.31/mysql-test/suite/innodb/r/monitor.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/r/monitor.result 2016-08-26 11:22:35.000000000 +0000 @@ -547,3 +547,52 @@ set global innodb_monitor_disable = default; set global innodb_monitor_reset = default; set global innodb_monitor_reset_all = default; +# +# Bug#22576241 SETTING INNODB_MONITOR_ENABLE TO ALL DOES NOT ENABLE ALL +# MONITORS +# +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf 0 +SET GLOBAL innodb_monitor_enable='module_buffer_page'; +INSERT INTO t1 VALUES (1), (2), (3), (4); +FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf NNNN +SET GLOBAL innodb_monitor_disable='module_buffer_page'; +SET GLOBAL innodb_monitor_reset_all='module_buffer_page'; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf 0 +SET GLOBAL innodb_monitor_enable='%'; +INSERT INTO t1 VALUES (5), (6), (7), (8); +FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf NNNN +SET GLOBAL innodb_monitor_disable='%'; +SET GLOBAL innodb_monitor_reset_all='%'; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf 0 +SET GLOBAL innodb_monitor_enable='ALL'; +INSERT INTO t1 VALUES (9), (10), (11), (12); +FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; +NAME COUNT +buffer_page_written_index_leaf NNNN +SET GLOBAL innodb_monitor_enable=default; +SET GLOBAL innodb_monitor_disable=default; +SET GLOBAL innodb_monitor_reset_all=default; +DROP TABLE t1; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/t/innodb_bug54044.test mysql-5.6-5.6.33/mysql-test/suite/innodb/t/innodb_bug54044.test --- mysql-5.6-5.6.31/mysql-test/suite/innodb/t/innodb_bug54044.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/t/innodb_bug54044.test 2016-08-26 11:22:35.000000000 +0000 @@ -10,10 +10,9 @@ SHOW CREATE TABLE table_54044; DROP TABLE table_54044; -# These 'create table' operations should fail because of -# using NULL datatype +# This 'create table' should pass since it uses a Field_string of size 0. -CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL; +CREATE TABLE tmp ENGINE = INNODB + AS SELECT COALESCE(NULL, NULL, NULL), GREATEST(NULL, NULL), NULL; SHOW CREATE TABLE tmp; DROP TABLE tmp; - diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/t/innodb-index-online-norebuild.test mysql-5.6-5.6.33/mysql-test/suite/innodb/t/innodb-index-online-norebuild.test --- mysql-5.6-5.6.31/mysql-test/suite/innodb/t/innodb-index-online-norebuild.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/t/innodb-index-online-norebuild.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,68 @@ +--echo # INPLACE ALTER WITH INPLACE_IGNORE FLAG AND CHANGE CREATE OPTION + +--echo # CHANGE THE COLUMN DEFAULT (INPLACE_IGNORE) +--echo # AND TABLE CHARSET(CHANGE CREATE) + +CREATE TABLE t1( + id INT PRIMARY KEY, + f1 INT NOT NULL DEFAULT 0)ENGINE=INNODB; + +INSERT INTO t1 VALUES(1, 2); + +let id_before_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t1"`; + +ALTER TABLE t1 MODIFY COLUMN f1 INT NOT NULL DEFAULT 0, + DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; + +let id_after_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t1"`; + +if ($id_before_alter != $id_after_alter) +{ + --echo "Table rebuild happened"; +} + +DROP TABLE t1; + +--echo # CHANGE THE STORAGE TYPE OF COLUMN(INPLACE IGNORE) +--echo # AND TABLE CHARSET(CHANGE CREATE) + +CREATE TABLE t1( + id INT STORAGE DISK)ENGINE=INNODB; + +INSERT INTO t1 values(1); + +let id_before_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t1"`; + +ALTER TABLE t1 MODIFY COLUMN id INT STORAGE MEMORY, + DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; + +let id_after_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t1"`; + +if ($id_before_alter != $id_after_alter) +{ + --echo "Table rebuild happened"; +} + +DROP TABLE t1; + +--echo # RENAME THE TABLE(INPLACE IGNORE) +--echo # AND CHANGE TABLE CHARSET(CHANGE CREATE) + +CREATE TABLE t1( + f1 INT NOT NULL, + f2 INT NOT NULL)ENGINE=INNODB; + +INSERT INTO t1 VALUES(1, 2); + +let id_before_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t1"`; + +ALTER TABLE t1 RENAME t2, DEFAULT CHARSET=latin1, ALGORITHM=INPLACE; + +let id_after_alter =`SELECT table_id FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name="test/t2"`; + +if ($id_before_alter != $id_after_alter) +{ + --echo "Table rebuild happened"; +} + +DROP TABLE t2; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb/t/monitor.test mysql-5.6-5.6.33/mysql-test/suite/innodb/t/monitor.test --- mysql-5.6-5.6.31/mysql-test/suite/innodb/t/monitor.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb/t/monitor.test 2016-08-26 11:22:35.000000000 +0000 @@ -385,3 +385,56 @@ set global innodb_monitor_reset = default; set global innodb_monitor_reset_all = default; -- enable_warnings + +--echo # +--echo # Bug#22576241 SETTING INNODB_MONITOR_ENABLE TO ALL DOES NOT ENABLE ALL +--echo # MONITORS +--echo # +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; + +let $innodb_monitor_enable = `SELECT @@innodb_monitor_enable`; + +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +SET GLOBAL innodb_monitor_enable='module_buffer_page'; +INSERT INTO t1 VALUES (1), (2), (3), (4); FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +SET GLOBAL innodb_monitor_disable='module_buffer_page'; +SET GLOBAL innodb_monitor_reset_all='module_buffer_page'; +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +SET GLOBAL innodb_monitor_enable='%'; +INSERT INTO t1 VALUES (5), (6), (7), (8); FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +SET GLOBAL innodb_monitor_disable='%'; +SET GLOBAL innodb_monitor_reset_all='%'; +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +SET GLOBAL innodb_monitor_enable='ALL'; +INSERT INTO t1 VALUES (9), (10), (11), (12); FLUSH TABLES t1 FOR EXPORT; +UNLOCK TABLES; +--replace_regex /[1-9]/NNNN/ +SELECT NAME, COUNT FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME +LIKE 'buffer_page_written_index_leaf'; + +--disable_warnings +SET GLOBAL innodb_monitor_enable=default; +SET GLOBAL innodb_monitor_disable=default; +SET GLOBAL innodb_monitor_reset_all=default; +--enable_warnings + +DROP TABLE t1; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb_fts/r/sync.result mysql-5.6-5.6.33/mysql-test/suite/innodb_fts/r/sync.result --- mysql-5.6-5.6.31/mysql-test/suite/innodb_fts/r/sync.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb_fts/r/sync.result 2016-08-26 11:22:35.000000000 +0000 @@ -100,3 +100,33 @@ 1 database 2 mysql DROP TABLE t1; +# Case 4: Test sync commit & rollback in background +CREATE TABLE t1( +id INT AUTO_INCREMENT, +title VARCHAR(100), +FULLTEXT(title), +PRIMARY KEY(id)) ENGINE=InnoDB; +SET SESSION debug="+d,fts_instrument_sync"; +INSERT INTO t1(title) VALUES('mysql'); +SET SESSION debug="-d,fts_instrument_sync"; +SET GLOBAL debug="+d,fts_instrument_sync,fts_instrument_sync_interrupted"; +INSERT INTO t1(title) VALUES('database'); +SET GLOBAL debug="-d,fts_instrument_sync,fts_instrument_sync_interrupted"; +SET SESSION debug="+d,fts_instrument_sync_debug"; +INSERT INTO t1(title) VALUES('good'); +SET SESSION debug="-d,fts_instrument_sync_debug"; +SET GLOBAL innodb_ft_aux_table="test/t1"; +SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE; +WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION +database 2 2 1 2 0 +good 3 3 1 3 0 +mysql 1 1 1 1 0 +SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE; +WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION +SET GLOBAL innodb_ft_aux_table=default; +SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database good'); +id title +1 mysql +2 database +3 good +DROP TABLE t1; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/innodb_fts/t/sync.test mysql-5.6-5.6.33/mysql-test/suite/innodb_fts/t/sync.test --- mysql-5.6-5.6.31/mysql-test/suite/innodb_fts/t/sync.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/innodb_fts/t/sync.test 2016-08-26 11:22:35.000000000 +0000 @@ -107,8 +107,6 @@ --echo # Case 3: Test insert crash recovery --let $_expect_file_name=$MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect -connect (con1,localhost,root,,); - CREATE TABLE t1 ( FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, title VARCHAR(200), @@ -139,4 +137,34 @@ DROP TABLE t1; +--echo # Case 4: Test sync commit & rollback in background +CREATE TABLE t1( + id INT AUTO_INCREMENT, + title VARCHAR(100), + FULLTEXT(title), + PRIMARY KEY(id)) ENGINE=InnoDB; + +SET SESSION debug="+d,fts_instrument_sync"; +INSERT INTO t1(title) VALUES('mysql'); +SET SESSION debug="-d,fts_instrument_sync"; + +--source include/restart_mysqld.inc + +SET GLOBAL debug="+d,fts_instrument_sync,fts_instrument_sync_interrupted"; +INSERT INTO t1(title) VALUES('database'); +SET GLOBAL debug="-d,fts_instrument_sync,fts_instrument_sync_interrupted"; + +SET SESSION debug="+d,fts_instrument_sync_debug"; +INSERT INTO t1(title) VALUES('good'); +SET SESSION debug="-d,fts_instrument_sync_debug"; + +SET GLOBAL innodb_ft_aux_table="test/t1"; +SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE; +SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE; +SET GLOBAL innodb_ft_aux_table=default; + +SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database good'); + +DROP TABLE t1; + --source include/wait_until_count_sessions.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/opt_trace/validate_json.pl mysql-5.6-5.6.33/mysql-test/suite/opt_trace/validate_json.pl --- mysql-5.6-5.6.31/mysql-test/suite/opt_trace/validate_json.pl 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/opt_trace/validate_json.pl 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,159 @@ +#!/usr/bin/perl +use strict; +use JSON; +use File::Spec::Functions qw/ canonpath /; +my $usage = "This is from WL#5257 \"first API for optimizer trace\". + +Usage: + %s [-q] + + -q quiet mode: only display errors and warnings. + +It will verify that all optimizer traces of files (usually a_file +is a .result or .reject file which contains +SELECT * FROM OPTIMIZER_TRACE; ) are JSON-compliant, and that +they contain no duplicates keys. +Exit code is 0 if all ok."; +my $retcode = 0; +my @ignored; +my @input = @ARGV; + +# Filter out "-q" options +@input = grep {!/-q/} @input; + +if (!@input) +{ + print "$usage\n"; + exit 1; +} + +# If command line contains at least one "-q" option, it is quiet mode +my $quiet= scalar(@input) <= scalar(@ARGV) -1; +# On Windows, command line arguments specified using wildcards need to be evaluated. +# On Unix too if the arguments are passed with single quotes. +my $need_parse = grep(/\*/,@input); +if ($need_parse) +{ + my $platform_independent_dir; + $platform_independent_dir= canonpath "@input"; + @input= glob "$platform_independent_dir"; +} + +foreach my $input_file (@input) +{ + handle_one_file($input_file); + print "\n"; +} + +if ( @ignored ) +{ + print STDERR "These files have been ignored:\n"; + foreach my $ig ( @ignored ) + { + print "$ig\n"; + } + print "\n"; +} +if ( $retcode ) +{ + print STDERR "There are errors\n"; +} + +else +{ + print "\n"; + print "ALL OK\n"; +} + +exit $retcode; + +sub handle_one_file { + + my ( $input_file ) = @_; + if ( $input_file =~ /^.*(ctype_.*|mysqldump)\.result/ ) + { + push @ignored ,$input_file; + return; + } + print "FILE $input_file\n"; + print "\n"; + open(DATA,"<$input_file") or die "Can't open file"; + my @lines = ; + close(DATA); + my $first_trace_line = 0; + my $trace_line = 0; + my @trace = undef; + label_to: foreach my $i ( @lines ) + { + $trace_line = $trace_line + 1; + if (( grep(/^.*(\t)?{\n/,$i) ) and ( $first_trace_line == 0 )) + { + @trace = undef; + $first_trace_line = $trace_line; + push @trace, "{\n"; + next label_to; + } + if (( $i =~ /^}/ ) and ( $first_trace_line != 0)) + { + push @trace, "}"; + check($first_trace_line,@trace); + $first_trace_line = 0; + } + if ( $first_trace_line != 0 ) + { + # Eliminate /* */ from end_marker=on (not valid JSON) + $i =~ s/\/\*.*\*\// /g; + push @trace, $i; + } + + } +} + + +sub check { + + my ( $first_trace_line, @trace ) = @_; + my $string = join("", @trace); + my $parsed; + eval { $parsed = decode_json($string); }; + unless ( $parsed ) + { + print "Parse error at line: $first_trace_line\n"; + my $error = $@; + print "Error: $@\n"; + # If there is a character position specified, put a mark ('&') in front of this character + if ($error =~ /invalid character.*at character offset (\d+)/) + { + substr($string,$1,0) = "&"; + print "$string\n"; + } + else + { + print "$string\n"; + } + $retcode = 1; + print "\n"; + return; + } + # Detect non-unique keys in one object, by counting + # number of quote symbols ("): the json module outputs only + # one of the non-unique keys, making the number of " + # smaller compared to the input string. + + my $before = $string =~ tr/'"'//; + my $re_json; + $re_json= to_json($parsed); + my $after = $re_json =~ tr/'"'//; + if ( $before != $after ) + { + print "Non-unique keys at line $first_trace_line ( $before vs $after )\n"; + print "$string\n"; + $retcode = 1; + print "\n"; + return; + } + if ( !$quiet ) + { + print "OK at line $first_trace_line\n"; + } +} diff -Nru mysql-5.6-5.6.31/mysql-test/suite/opt_trace/validate_json.py mysql-5.6-5.6.33/mysql-test/suite/opt_trace/validate_json.py --- mysql-5.6-5.6.31/mysql-test/suite/opt_trace/validate_json.py 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/opt_trace/validate_json.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -#! /usr/bin/python - -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - -import sys - -usage = """ -This is from WL#5257 "first API for optimizer trace". - -Usage: - %s [-q] - - -q quiet mode: only display errors and warnings. - -It will verify that all optimizer traces of files (usually a_file -is a .result or .reject file which contains -SELECT * FROM OPTIMIZER_TRACE; ) are JSON-compliant, and that -they contain no duplicates keys. -Exit code is 0 if all ok. -""" % sys.argv[0] - -input_files = filter(lambda x: x != '-q', sys.argv[1:]) # filter out "-q" options - -if not input_files: - print usage - sys.exit(1) - -quiet = len(input_files) < len(sys.argv) - 1 # command line contains at least one "-q" option - -import json, re - -trace_start_re = re.compile(r"^.*(\t)?{\n") -trace_end_re = re.compile(r"^}") -ignorable_re = re.compile(r"^.*(ctype_.*|mysqldump)\.result") - -def check(trace, first_trace_line): - global retcode - s = "".join(trace) - try: - parsed = json.loads(s) - except: - print "parse error at line", first_trace_line - error = str(sys.exc_info()) - print error - # if there is a character position specified, put a mark ('&') - # in front of this character - matchobj = re.search(r"ValueError\('Invalid control character at: line \d+ column \d+ \(char (\d+)\)'", error) - if matchobj: - first_error_char = int(matchobj.group(1)) - print s[:first_error_char] + "&" + s[first_error_char:] - else: - print s - retcode = 1 - print - return - # detect non-unique keys in one object, by counting - # number of quote symbols ("'): the json module outputs only - # one of the non-unique keys, making the number of " and ' - # smaller compared to the input string. - before = s.count('"') + s.count("'") - str_parsed = str(parsed) - after = str_parsed.count('"') + str_parsed.count("'") - if (before != after): - print "non-unique keys at line %d (%d vs %d)" % (first_trace_line, before, after) - print s - retcode = 1 - print - return - if not quiet: - print "ok at line", first_trace_line - -def handle_one_file(name): - if ignorable_re.match(name): - ignored.append(name) - return - print "FILE %s" % name - print - all = open(name).readlines() - first_trace_line = trace_line = 0 - trace = None - for l in all: - trace_line += 1 - if trace_start_re.match(l) and first_trace_line == 0: - trace = [] - first_trace_line = trace_line - trace.append("{\n") - continue - if trace_end_re.match(l): - assert first_trace_line != 0 - trace.append("}") # eliminate any following columns of table (MISSING_PRIVILEGES etc) - check(trace, first_trace_line) - first_trace_line = 0 - if first_trace_line != 0: - # eliminate /* */ from end_marker=on (not valid JSON) - no_comment = re.sub("/\*.*\*/", "", l) - trace.append(no_comment) - -retcode=0 -ignored=[] -for f in input_files: - handle_one_file(f) - print -if ignored: - print >>sys.stderr, "Those files have been ignored", ignored -print -if retcode: - print >>sys.stderr, "THERE ARE ERRORS" -else: - print "ALL OK" -sys.exit(retcode) diff -Nru mysql-5.6-5.6.31/mysql-test/suite/perfschema/r/aggregate.result mysql-5.6-5.6.33/mysql-test/suite/perfschema/r/aggregate.result --- mysql-5.6-5.6.31/mysql-test/suite/perfschema/r/aggregate.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/perfschema/r/aggregate.result 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -"General cleanup" -drop table if exists t1; -update performance_schema.setup_instruments set enabled = 'NO'; -update performance_schema.setup_consumers set enabled = 'NO'; -truncate table performance_schema.file_summary_by_event_name; -truncate table performance_schema.file_summary_by_instance; -truncate table performance_schema.socket_summary_by_event_name; -truncate table performance_schema.socket_summary_by_instance; -truncate table performance_schema.events_waits_summary_global_by_event_name; -truncate table performance_schema.events_waits_summary_by_instance; -truncate table performance_schema.events_waits_summary_by_thread_by_event_name; -update performance_schema.setup_consumers set enabled = 'YES'; -update performance_schema.setup_instruments -set enabled = 'YES', timed = 'YES'; -create table t1 ( -id INT PRIMARY KEY, -b CHAR(100) DEFAULT 'initial value') -ENGINE=MyISAM; -insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8); -update performance_schema.setup_instruments SET enabled = 'NO'; -update performance_schema.setup_consumers set enabled = 'NO'; -set @dump_all=FALSE; -"Verifying file aggregate consistency" -SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) -OR @dump_all; -EVENT_NAME COUNT_READ SUM(i.COUNT_READ) -SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) -OR @dump_all; -EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE) -SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.socket_summary_by_event_name AS e -JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) -OR @dump_all; -EVENT_NAME COUNT_READ SUM(i.COUNT_READ) -SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.socket_summary_by_event_name AS e -JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) -OR @dump_all; -EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE) -SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ)) -OR @dump_all; -EVENT_NAME SUM_NUMBER_OF_BYTES_READ SUM(i.SUM_NUMBER_OF_BYTES_READ) -SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE)) -OR @dump_all; -EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM(i.SUM_NUMBER_OF_BYTES_WRITE) -"Verifying waits aggregate consistency (instance)" -SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) -OR @dump_all; -EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIMER_WAIT) -SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT)) -AND (MIN(i.MIN_TIMER_WAIT) != 0) -OR @dump_all; -EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT) -SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) -OR @dump_all; -EVENT_NAME MAX_TIMER_WAIT MAX(i.MAX_TIMER_WAIT) -"Verifying waits aggregate consistency (thread)" -SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) -OR @dump_all; -EVENT_NAME SUM_TIMER_WAIT SUM(t.SUM_TIMER_WAIT) -SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) -AND (MIN(t.MIN_TIMER_WAIT) != 0) -OR @dump_all; -EVENT_NAME MIN_TIMER_WAIT MIN(t.MIN_TIMER_WAIT) -SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) -OR @dump_all; -EVENT_NAME MAX_TIMER_WAIT MAX(t.MAX_TIMER_WAIT) -update performance_schema.setup_consumers set enabled = 'YES'; -update performance_schema.setup_instruments -set enabled = 'YES', timed = 'YES'; -drop table test.t1; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/perfschema/t/aggregate.test mysql-5.6-5.6.33/mysql-test/suite/perfschema/t/aggregate.test --- mysql-5.6-5.6.31/mysql-test/suite/perfschema/t/aggregate.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/perfschema/t/aggregate.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,191 +0,0 @@ -# Tests for PERFORMANCE_SCHEMA -# Verify that statistics aggregated by different criteria are consistent. - ---source include/not_embedded.inc ---source include/have_perfschema.inc ---source include/have_QC_Disabled.inc - ---echo "General cleanup" - ---disable_warnings -drop table if exists t1; ---enable_warnings - -update performance_schema.setup_instruments set enabled = 'NO'; -update performance_schema.setup_consumers set enabled = 'NO'; - -# Cleanup statistics -truncate table performance_schema.file_summary_by_event_name; -truncate table performance_schema.file_summary_by_instance; -truncate table performance_schema.socket_summary_by_event_name; -truncate table performance_schema.socket_summary_by_instance; -truncate table performance_schema.events_waits_summary_global_by_event_name; -truncate table performance_schema.events_waits_summary_by_instance; -truncate table performance_schema.events_waits_summary_by_thread_by_event_name; - -# Start recording data -update performance_schema.setup_consumers set enabled = 'YES'; -update performance_schema.setup_instruments - set enabled = 'YES', timed = 'YES'; - - -create table t1 ( - id INT PRIMARY KEY, - b CHAR(100) DEFAULT 'initial value') - ENGINE=MyISAM; - -insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8); - -# Stop recording data, so the select below don't add noise. -update performance_schema.setup_instruments SET enabled = 'NO'; -# Disable all consumers, for long standing waits -update performance_schema.setup_consumers set enabled = 'NO'; - -# Helper to debug -set @dump_all=FALSE; - -# Note that in general: -# - COUNT/SUM/MAX(file_summary_by_event_name) >= -# COUNT/SUM/MAX(file_summary_by_instance). -# - MIN(file_summary_by_event_name) <= -# MIN(file_summary_by_instance). -# There will be equality only when file instances are not removed, -# aka when a file is not deleted from the file system, -# because doing so removes a row in file_summary_by_instance. - -# Likewise: -# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >= -# COUNT/SUM/MAX(events_waits_summary_by_instance) -# - MIN(events_waits_summary_global_by_event_name) <= -# MIN(events_waits_summary_by_instance) -# There will be equality only when an instrument instance -# is not removed, which is next to impossible to predictably guarantee -# in the server. -# For example, a MyISAM table removed from the table cache -# will cause a mysql_mutex_destroy on myisam/MYISAM_SHARE::intern_lock. -# Another example, a thread terminating will cause a mysql_mutex_destroy -# on sql/LOCK_delete -# Both cause a row to be deleted from events_waits_summary_by_instance. - -# Likewise: -# - COUNT/SUM/MAX(events_waits_summary_global_by_event_name) >= -# COUNT/SUM/MAX(events_waits_summary_by_thread_by_event_name) -# - MIN(events_waits_summary_global_by_event_name) <= -# MIN(events_waits_summary_by_thread_by_event_name) -# There will be equality only when no thread is removed, -# that is if no thread disconnects, or no sub thread (for example insert -# delayed) ever completes. -# A thread completing will cause rows in -# events_waits_summary_by_thread_by_event_name to be removed. - ---echo "Verifying file aggregate consistency" - -# Since the code generating the load in this test does: -# - create table -# - insert -# - does not cause temporary tables to be used -# we can test for equality here for file aggregates. - -# If any of these queries returns data, the test failed. - -SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) -OR @dump_all; - -SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) -OR @dump_all; - -SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) -FROM performance_schema.socket_summary_by_event_name AS e -JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) -OR @dump_all; - -SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) -FROM performance_schema.socket_summary_by_event_name AS e -JOIN performance_schema.socket_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) -OR @dump_all; - -SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ)) -OR @dump_all; - -SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE) -FROM performance_schema.file_summary_by_event_name AS e -JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE)) -OR @dump_all; - ---echo "Verifying waits aggregate consistency (instance)" - -SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) -OR @dump_all; - -SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT)) -AND (MIN(i.MIN_TIMER_WAIT) != 0) -OR @dump_all; - -SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) -OR @dump_all; - ---echo "Verifying waits aggregate consistency (thread)" - -SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) -OR @dump_all; - -SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) -AND (MIN(t.MIN_TIMER_WAIT) != 0) -OR @dump_all; - -SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT) -FROM performance_schema.events_waits_summary_global_by_event_name AS e -JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t -USING (EVENT_NAME) -GROUP BY EVENT_NAME -HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) -OR @dump_all; - - -# Cleanup - -update performance_schema.setup_consumers set enabled = 'YES'; -update performance_schema.setup_instruments - set enabled = 'YES', timed = 'YES'; - -drop table test.t1; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_autoinc_lock_style.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_autoinc_lock_style.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_autoinc_lock_style.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_autoinc_lock_style.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,15 @@ +include/master-slave.inc +Warnings: +Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. +Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. +[connection master] +CREATE TABLE t (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +include/sync_slave_sql_with_master.inc +SET @save_debug=@@debug; +SET GLOBAL DEBUG='+d,die_if_autoinc_old_lock_style_used'; +[connection master] +INSERT INTO t VALUES (1); +DROP TABLE t; +include/sync_slave_sql_with_master.inc +SET GLOBAL DEBUG=@save_debug; +include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -==== Configure ==== -==== Initialize ==== -include/rpl_init.inc [topology=1->2->3->4->5->1] -include/rpl_sync.inc -include/rpl_reset.inc -==== Test ==== -==== Sync ==== -Reap all sent queries. -include/rpl_stop_slaves.inc -include/rpl_change_topology.inc [new topology=1->2->3->4->5->1] -include/rpl_start_slaves.inc -include/rpl_sync.inc -==== Check result ==== -Check that GTID_EXECUTED is equal on all servers. -Check that database state is equal on all servers. -include/diff_servers.inc [servers=1 2 3 4 5 ] -==== Clean up ==== -include/rpl_sync.inc -include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_row_img_sanity.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_row_img_sanity.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_row_img_sanity.result 2016-08-26 11:22:35.000000000 +0000 @@ -639,6 +639,73 @@ include/wait_for_slave_sql_error.inc [errno=1032] DROP TABLE t; include/rpl_reset.inc +CON: 'master', IMG: 'FULL', RESTART SLAVE: 'N' +SET SESSION binlog_row_image= 'FULL'; +SET GLOBAL binlog_row_image= 'FULL'; +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image FULL +CON: 'slave', IMG: 'FULL', RESTART SLAVE: 'Y' +SET SESSION binlog_row_image= 'FULL'; +SET GLOBAL binlog_row_image= 'FULL'; +include/stop_slave.inc +include/start_slave.inc +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image FULL +CREATE TABLE t1(id INT PRIMARY KEY, a INT) ENGINE = INNODB; +include/sync_slave_sql_with_master.inc +INSERT INTO t1 (id, a) VALUES (1, 1); +"Case: FULL - EXPLAIN output should not display Using temporary" +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range PRIMARY PRIMARY 4 const 1 Using where +UPDATE t1 SET a=a+1 WHERE id < 2; +CON: 'master', IMG: 'NOBLOB', RESTART SLAVE: 'N' +SET SESSION binlog_row_image= 'NOBLOB'; +SET GLOBAL binlog_row_image= 'NOBLOB'; +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image NOBLOB +CON: 'slave', IMG: 'NOBLOB', RESTART SLAVE: 'Y' +SET SESSION binlog_row_image= 'NOBLOB'; +SET GLOBAL binlog_row_image= 'NOBLOB'; +include/stop_slave.inc +include/start_slave.inc +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image NOBLOB +"Case: NOBLOB - EXPLAIN output should not display Using temporary" +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range PRIMARY PRIMARY 4 const 1 Using where +UPDATE t1 SET a=a+1 WHERE id < 2; +CON: 'master', IMG: 'MINIMAL', RESTART SLAVE: 'N' +SET SESSION binlog_row_image= 'MINIMAL'; +SET GLOBAL binlog_row_image= 'MINIMAL'; +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image MINIMAL +CON: 'slave', IMG: 'MINIMAL', RESTART SLAVE: 'Y' +SET SESSION binlog_row_image= 'MINIMAL'; +SET GLOBAL binlog_row_image= 'MINIMAL'; +include/stop_slave.inc +include/start_slave.inc +FLUSH TABLES; +SHOW VARIABLES LIKE 'binlog_row_image'; +Variable_name Value +binlog_row_image MINIMAL +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range PRIMARY PRIMARY 4 const 1 Using where +UPDATE t1 SET a=a+1 WHERE id < 2; +DROP TABLE t1; +include/sync_slave_sql_with_master.inc SET GLOBAL binlog_row_image= @old_binlog_row_image; SET SESSION binlog_row_image= @old_binlog_row_image; SET GLOBAL binlog_row_image= @old_binlog_row_image; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_row_slave_skip_error_all.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,46 @@ +include/master-slave.inc +Warnings: +Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. +Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. +[connection master] +CREATE TABLE t (name VARCHAR(25) DEFAULT NULL) ENGINE=InnoDB; +include/sync_slave_sql_with_master.inc +call mtr.add_suppression("Slave SQL.*Error executing row event: .Table .test.t. doesn.t exist., Error_code: 1146"); +call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); +call mtr.add_suppression("Got error 1 during COMMIT"); +ALTER TABLE t CHANGE name name VARCHAR(255); +[connection master] +INSERT INTO t VALUE ('Amy'); +# Sync should be successful. Slave should not stop with an error +# ER_SLAVE_CONVERSION_FAILED. It should be up and running in spite +# of errors as we have set slave_skip_error=all. +include/sync_slave_sql_with_master.inc +DROP TABLE t; +[connection master] +UPDATE t SET name='New'; +# Sync should be successful. Slave should not stop with an error +# ER_NO_SUCH_TABLE. It should be up and running in spite of errors +# as we have set slave_skip_error=all. +include/sync_slave_sql_with_master.inc +# Enable a debug point to simulate failure during rows event cleanup. +SET @@GLOBAL.DEBUG= 'd,simulate_rows_event_cleanup_failure'; +[connection master] +UPDATE t SET name='Old'; +[connection slave] +# Since this is not an ignored error slave should stop. We only ignore the +# errors that are generated during the execution of an event. The other errors +# that are generated during commit/rollback failure, which takes place during cleanup +# cannot be ignored. +include/wait_for_slave_sql_error.inc [errno=1180] +==== Clean up ==== +SET @@GLOBAL.DEBUG= '$debug_saved'; +include/stop_slave_io.inc +RESET MASTER; +RESET SLAVE; +include/start_slave.inc +[connection master] +include/sync_slave_sql_with_master.inc +[connection master] +DROP TABLE t; +include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_server_uuid.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_server_uuid.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_server_uuid.result 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_server_uuid.result 2016-08-26 11:22:35.000000000 +0000 @@ -9,7 +9,7 @@ CALL mtr.add_suppression("Master's UUID has changed, although this should not happen unless you have changed it manually"); CALL mtr.add_suppression("Slave I/O: SET @master_heartbeat_period to master failed with error: Lost connection to MySQL server during query"); CALL mtr.add_suppression("Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error"); -CALL mtr.add_suppression("A slave with the same server_uuid as this slave has connected to the master"); +CALL mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master"); include/sync_slave_sql_with_master.inc # Case 1: diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result --- mysql-5.6-5.6.31/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/r/rpl_zombie_dump_threads.result 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,16 @@ +include/master-slave.inc +Warnings: +Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. +Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. +[connection master] +include/stop_dump_threads.inc +[connection slave] +SET @save_debug = @@GLOBAL.debug; +SET GLOBAL debug="d,fake_5_5_version_slave"; +include/start_slave_io.inc +include/stop_slave_io.inc +include/start_slave_io.inc +[connection master] +[connection slave] +SET GLOBAL debug=@save_debug; +include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/disabled.def mysql-5.6-5.6.33/mysql-test/suite/rpl/t/disabled.def --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/disabled.def 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/disabled.def 2016-08-26 11:22:35.000000000 +0000 @@ -13,4 +13,3 @@ rpl_row_create_table : Bug#11759274 2010-02-27 andrei failed different way than earlier with bug#45576 rpl_delayed_slave : Bug#11764654 2010-11-09 andrei rpl_delayed_slave fails sporadically in pb rpl_row_binlog_max_cache_size : BUG#14126780 May 29 2012 Vasil Dimov timeout if est number of rows is 3 instead of 4 -rpl.rpl_gtid_stress_failover : BUG#20630589 2015-10-06 parveez Test needs to be stabilized diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_autoinc_lock_style.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_autoinc_lock_style.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_autoinc_lock_style.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_autoinc_lock_style.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,46 @@ +############################################################################### +# Bug#22247668 SLAVE IS ~10X SLOWER TO EXECUTE SET OF STATEMENTS COMPARED TO +# MASTER RBR +# Problem: A new style of locking is implemented in Innodb. Starting from 5.6, +# Innodb uses this new style of locking for all the cases except for the case +# where for a simple (single/multi) row INSERTs, it fall back to old style +# locking if another transaction has already acquired the AUTOINC lock on behalf of +# a LOAD FILE or INSERT...SELECT etc. type of statement. But on +# Slave, in RBR format, it is always using old style auto inc +# algorithm. +# +# Steps to reproduce: +# 1) Setup DEBUG simulation point on Slave to bring the server down +# if the INSERT enters old style autoinc locking method. +# +# 2) Execute AUTOINC related work on Master. +# +# 3) Make sure that sync on slave happens without any issues. +# +############################################################################### +--source include/have_debug.inc +--source include/have_binlog_format_row.inc +--source include/master-slave.inc + +# Initial setup +CREATE TABLE t (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +--source include/sync_slave_sql_with_master.inc + +# Step-1 : Setup DEBUG simulation point on Slave to bring the server down +# if the INSERT enters old style autoinc locking method. +SET @save_debug=@@debug; +SET GLOBAL DEBUG='+d,die_if_autoinc_old_lock_style_used'; + +# Step-2 :Execute AUTOINC related work on Master. +--source include/rpl_connection_master.inc +INSERT INTO t VALUES (1); +DROP TABLE t; + +# Step-3: Due to above DEBUG simulation point, server will go down if it enters +# old autoinc lock style. After fix, sync on Slave happens without any issues. +--source include/sync_slave_sql_with_master.inc + +# Cleanup +# Reset the simulation point on Slave. +SET GLOBAL DEBUG=@save_debug; +--source include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -!include ../my.cnf -[mysqld.1] -gtid-mode=on -enforce-gtid-consistency -log-slave-updates - -[mysqld.2] -gtid-mode=on -enforce-gtid-consistency -log-slave-updates - -[mysqld.3] -gtid-mode=on -enforce-gtid-consistency -log-slave-updates -server-id=3 - -[mysqld.4] -gtid-mode=on -enforce-gtid-consistency -log-slave-updates -server-id=4 - -[mysqld.5] -gtid-mode=on -enforce-gtid-consistency -log-slave-updates -server-id=5 - -#[mysqld.6] -#gtid-mode=on -#enforce-gtid-consistency -#log-slave-updates -#server-id=6 -# -#[mysqld.7] -#gtid-mode=on -#enforce-gtid-consistency -#log-slave-updates -#server-id=7 -# -#[mysqld.8] -#gtid-mode=on -#enforce-gtid-consistency -#log-slave-updates -#server-id=8 -# -#[mysqld.9] -#gtid-mode=on -#enforce-gtid-consistency -#log-slave-updates -#server-id=9 - -[ENV] -SERVER_MYPORT_3= @mysqld.3.port -SERVER_MYPORT_4= @mysqld.4.port -SERVER_MYPORT_5= @mysqld.5.port -#SERVER_MYPORT_6= @mysqld.6.port -#SERVER_MYPORT_7= @mysqld.7.port -#SERVER_MYPORT_8= @mysqld.8.port -#SERVER_MYPORT_9= @mysqld.9.port diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test 1970-01-01 00:00:00.000000000 +0000 @@ -1,444 +0,0 @@ -# ==== Purpose ==== -# -# Test that it is possible to change the topology completely randomly, -# and the GTID system takes care of sending the correct transactions, -# as long as all servers generate non-conflicting transactions. -# -# ==== Implementation ==== -# -# Configure X servers and Y clients on each server. Iterate Z times. -# -# In each iteration, select a random server and select a random client -# on that server. On this connection, perform each of the following -# with a fixed probability: -# -# - A transaction (DML) -# - A DDL statement -# - FLUSH LOGS -# - CHANGE MASTER to a random other server -# -# After all iterations are done, change to a circular topology and -# wait for the servers to synchronize. Then check that all servers -# have the same data. -# -# Details: -# - We create as many databases as we have servers. -# - Each server only executes DML / DDL on one database. -# - Each database has one table per client. Initially, the table -# names are t_1_0, t_2_0, ..., t_Y_0, where Y is the number of -# clients per server, and all tables are empty. -# - The DDL consists in replacing the table by t_y_i, where i is the -# iteration counter and y is the client used in this iteration. -# t_y_i is empty. We do this in a funny way (see the code) just to -# use a couple of different DDL statements. -# - The DML consists in replacing the contents of t_y_*, by the value -# i, where i is the iteration counter and y is the client used in -# this iteration. We do this in a funny way (see the code) just to -# use a couple of diffrent DML statements. -# -# ==== Custom usage ==== -# -# You can alter the behavior of this test by setting the following -# variables (as environment variables or mtr variables): -# -# $debug -# If set, print all statements (default off) -# -# $max_iterations -# The maximal number of iterations to run. (default 10000) -# -# $max_seconds -# The maximal time to run iterations. (default 300) -# -# $n_servers -# The number of servers to run on (default 5) -# -# $n_clients_per_server -# The number of clients to use for each server (default 5) -# -# $change_master_probability -# The probability to execute CHANGE MASTER in each iteration (default 0.1) -# -# $flush_logs_probability -# The probability to execute FLUSH LOGS in each iteration (default 0.05) -# -# $dml_probability -# The probability to execute DML in each iteration (default 1) -# -# $ddl_probability -# The probability to execute DDL in each iteration (default 0.1) -# -# $deterministic -# By default, the random seed is taken to be a random number, -# different for each run, and the test is deliberately executing -# several tasks concurrently. If $deterministic is set, the random -# seed is taken to be the value of $deterministic, and the -# concurrency is reduced (but not entirely eliminated). -# -# ==== References ==== -# -# WL#3584: Global Transaction Identifiers -# - Created as part of this worklog -# BUG#18385953: RPL_GTID_STRESS_FAILOVER FAILS WITH "ERROR IN SYNC_WITH_MASTER.INC" -# - fixed bug in cleanup code - -#Want to skip this test from daily Valgrind execution ---source include/no_valgrind_without_big.inc ---source include/big_test.inc ---source include/have_gtid.inc - -# This test case has path issues when executing the -# external command mysqldump.exe on windows. Since -# what it tests is not platform dependent we disable -# it on Windows. ---source include/not_windows.inc - -# This test case fails in MTS mode due to BUG#12995174 -# once that bug is fixed, the following line should be -# removed so that the test is enabled in MTS ---source include/not_mts_slave_parallel_workers.inc - ---echo ==== Configure ==== - -if ($max_seconds == '') -{ - --let $max_seconds= 300 -} -if ($max_iterations == '') -{ - --let $max_iterations= 10000 -} -if (!$n_servers) -{ - --let $n_servers= 5 -} -if (!$n_clients_per_server) -{ - --let $n_clients_per_server= 5 -} - -if ($change_master_probability == '') -{ - --let $change_master_probability= 0.1 -} -if ($flush_logs_probability == '') -{ - --let $flush_logs_probability= 0.05 -} -if ($dml_probability == '') -{ - --let $dml_probability= 1 -} -if ($ddl_probability == '') -{ - --let $ddl_probability= 0.1 -} - -if ($deterministic != '') -{ - --let $rand_seed= $deterministic -} - ---echo ==== Initialize ==== - ---let $underscore= _ ---let $zero= 0 - -if (!$debug) -{ - --disable_query_log - --disable_result_log -} -if ($debug) -{ - --echo debug: n_servers=$n_servers n_clients_per_server=$n_clients_per_server max_iterations=$max_iterations max_seconds=$max_seconds - --echo debug: change_master_probability=$change_master_probability flush_logs_probability=$flush_logs_probability dml_probability=$dml_probability ddl_probability=$ddl_probability -} - ---let $circular_topology= 1 ---let $server_list= ---let $server= $n_servers -while ($server > 0) -{ - --let $circular_topology= $server->$circular_topology - --let $server_list= $server $server_list - --dec $server -} - ---let $rpl_extra_connections_per_server= $n_clients_per_server ---let $rpl_topology= $circular_topology ---let $use_gtids= 1 ---source include/rpl_init.inc - ---let $server= 1 -while ($server <= $n_servers) -{ - --connection server_$server - eval CREATE DATABASE db_$server; - - --let $client= 1 - while ($client <= $n_clients_per_server) - { - --let $connection= server_$server$underscore$client - --connection $connection - - eval CREATE TABLE db_$server.t_$client$underscore$zero (a INT) ENGINE = InnoDB; - eval SET @last_value = -1; - - --inc $client - } - --inc $server -} - ---source include/rpl_sync.inc ---source include/rpl_reset.inc - ---let $server= 1 -while ($server <= $n_servers) -{ - --let $client= 1 - while ($client <= $n_clients_per_server) - { - --connection server_$server$underscore$client - send SELECT 1; - --inc $client - } - --inc $server -} - - ---echo ==== Test ==== - ---connection default ---let $iteration= 1 ---let $start_time= `SELECT UNIX_TIMESTAMP()` ---let $done= 0 -while (!$done) -{ - --connection default - - --let $rand_type= int - --let $rand_min= 1 - --let $rand_max= $n_servers + 1 - --source include/rand.inc - --let $server= $rand - - --let $rand_max= $n_clients_per_server + 1 - --source include/rand.inc - --let $client= $rand - - --let $rand_type= decide - --let $rand_probability= $change_master_probability - --source include/rand.inc - --let $do_change_master= $rand - - --let $rand_probability= $flush_logs_probability - --source include/rand.inc - --let $do_flush_logs= $rand - - --let $rand_probability= $dml_probability - --source include/rand.inc - --let $do_dml= $rand - - --let $rand_probability= $ddl_probability - --source include/rand.inc - --let $do_ddl= $rand - - if ($debug) - { - --echo debug: server=$server client=$client change_master=$do_change_master flush=$do_flush_logs dml=$do_dml ddl=$do_ddl - } - - --let $connection= server_$server$underscore$client - --connection $connection - - if ($do_change_master) - { - --reap - - # Computes a random number between 1 and $n_servers that is - # different from $server. - --let $rand_type= int - --let $rand_min= 0 - --let $rand_max= $n_servers - 1 - --source include/rand.inc - --let $new_master= `SELECT 1 + (($server + $rand) % $n_servers)` - if ($debug) - { - --echo change master for $server to $new_master - } - - --let $include_silent= 1 - --source include/stop_slave.inc - - --let $port= \$SERVER_MYPORT_$new_master - --disable_warnings - eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', - MASTER_PORT = $port, - MASTER_USER = 'root', - MASTER_CONNECT_RETRY = 1, - MASTER_AUTO_POSITION = 1; - --enable_warnings - - --source include/start_slave.inc - --let $include_silent= 0 - # give something for the next reap - send SELECT 1; - } - - if ($do_flush_logs) - { - --reap - send FLUSH LOGS; - } - - if ($do_dml) - { - --reap - --let $t= `SHOW TABLES IN db_$server LIKE 't_$client$underscore%'` - --let $t= db_$server.$t - --let $last_value= `SELECT @last_value` - --delimiter | - send| - eval - BEGIN; - INSERT INTO $t VALUES (-1); - UPDATE $t SET a = $iteration WHERE a = $last_value; - DELETE FROM $t WHERE a = -1; - COMMIT; - SET @last_value= $iteration; - | - --delimiter ; - } - - if ($do_ddl) - { - --reap - --let $t= `SHOW TABLES IN db_$server LIKE 't_$client$underscore%'` - --let $t= db_$server.$t - --delimiter | - send| - eval - CREATE TABLE db_$server.t_$client (a INT) ENGINE = InnoDB; - DROP TABLE $t; - RENAME TABLE db_$server.t_$client TO db_$server.t_$client$underscore$iteration; - SET @last_value = -1; - | - --delimiter ; - } - - if ($deterministic != '') - { - --reap - --sleep 2 - --send SELECT 1 - } - - --inc $iteration - - if ($iteration > $max_iterations) - { - --let $done= 1 - } - --connection default - --let $elapsed_time= `SELECT UNIX_TIMESTAMP() - $start_time` - if ($elapsed_time > $max_seconds) - { - --let $done= 1 - } -} -if ($debug) -{ - --echo exited after iteration $iteration, $elapsed_time seconds (max_seconds=$max_seconds, start_time=$start_time) -} -# extra debug info for show_rpl_debug_info ---let $extra_debug_info= iterations=$iterations - - ---echo ==== Sync ==== - ---echo Reap all sent queries. ---let $server= 1 -while ($server <= $n_servers) -{ - --let $client= 1 - while ($client <= $n_clients_per_server) - { - --connection server_$server$underscore$client - --reap - --inc $client - } - --inc $server -} - -# Wait for replication to catch up ---connection default - ---source include/rpl_stop_slaves.inc - ---let $rpl_topology= $circular_topology ---let $rpl_extra_connections_per_server= 5 ---let $rpl_unconditional_change_master= 1 ---source include/rpl_change_topology.inc - ---source include/rpl_start_slaves.inc - ---source include/rpl_sync.inc - - ---echo ==== Check result ==== - ---echo Check that GTID_EXECUTED is equal on all servers. ---let $server= 1 -while ($server <= $n_servers) -{ - --connection server_$server - --let $gtid_executed= `SELECT @@GLOBAL.GTID_EXECUTED` - if ($server > 1) - { - if ($last_gtid_executed != $gtid_executed) - { - --source include/show_rpl_debug_info.inc - --echo ERROR: GTID_EXECUTED differs between server 1 and server $server - --echo ERROR: GTID_EXECUTED on server 1: '$last_gtid_executed' - --echo ERROR: GTID_EXECUTED on server $server: '$gtid_executed' - --die GTID_EXECUTED differs between two servers - } - } - --let $last_gtid_executed= $gtid_executed - --inc $server -} - ---echo Check that database state is equal on all servers. ---let $diff_servers= $server_list ---source include/diff_servers.inc - - ---echo ==== Clean up ==== - -# drop database ---connection default ---let $server= 1 -while ($server <= $n_servers) -{ - eval DROP DATABASE db_$server; - --inc $server -} ---source include/rpl_sync.inc - -# restore AUTO_POSITION ---let $server= 1 -while ($server <= $n_servers) -{ - --connection server_$server - - --let $include_silent=1 - --source include/stop_slave.inc - CHANGE MASTER TO MASTER_AUTO_POSITION=0; - --source include/start_slave.inc - --let $include_silent=0 - - --inc $server -} - ---source include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_img_sanity.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_img_sanity.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_img_sanity.test 2016-08-26 11:22:35.000000000 +0000 @@ -806,10 +806,73 @@ source include/wait_for_slave_sql_error.inc; DROP TABLE t; --let $rpl_only_running_threads= 1 + +# ==== Purpose ==== +# +# Check that when binlog_row_image= FULL 'UPDATE' query should not using +# temporary if the PRIMARY KEY not being modified as part of the query. +# +# ==== Implementation ==== +# +# Set binlog_row_image= FULL. Create a table which has both a primary key and +# a regular int field which is not a key. Execute an UPDATE statement in such +# a way that it doesn't update the primary key field. See the 'EXPLAIN' output +# it should not use a temporary table. Repeat the same test in case of +# binlog_row_image= NOBLOB as well. No temporary table should be used in this +# case as well. +# +# ==== References ==== +# +# Bug#22510353: UNNECESSARY USING TEMPORARY FOR UPDATE +# +############################################################################### -- source include/rpl_reset.inc +-- connection master +-- let $row_img_set=master:FULL:N,slave:FULL:Y +-- source include/rpl_row_img_set.inc +CREATE TABLE t1(id INT PRIMARY KEY, a INT) ENGINE = INNODB; -## CLEAN UP +--source include/sync_slave_sql_with_master.inc + +-- connection master +-- let $row_img_query= INSERT INTO t1 (id, a) VALUES (1, 1) +-- let $row_img_expected_master= | 1:1 2:1 +-- let $row_img_expected_slave = | 1:1 2:1 +-- source include/rpl_row_img_parts_master_slave.inc + +-- echo "Case: FULL - EXPLAIN output should not display Using temporary" +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; + +-- let $row_img_query= UPDATE t1 SET a=a+1 WHERE id < 2 +-- let $row_img_expected_master= 1:1 2:1 | 1:1 2:2 +-- let $row_img_expected_slave = 1:1 2:1 | 1:1 2:2 +-- source include/rpl_row_img_parts_master_slave.inc + +-- let $row_img_set=master:NOBLOB:N,slave:NOBLOB:Y +-- source include/rpl_row_img_set.inc +-- echo "Case: NOBLOB - EXPLAIN output should not display Using temporary" +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; + +-- let $row_img_query= UPDATE t1 SET a=a+1 WHERE id < 2 +-- let $row_img_expected_master= 1:1 2:2 | 1:1 2:3 +-- let $row_img_expected_slave = 1:1 2:2 | 1:1 2:3 +-- source include/rpl_row_img_parts_master_slave.inc + +-- let $row_img_set=master:MINIMAL:N,slave:MINIMAL:Y +-- source include/rpl_row_img_set.inc + +EXPLAIN UPDATE t1 SET a=a+1 WHERE id < 2; + +-- let $row_img_query= UPDATE t1 SET a=a+1 WHERE id < 2 +-- let $row_img_expected_master= 1:1 | 2:4 +-- let $row_img_expected_slave = 1:1 | 2:4 +-- source include/rpl_row_img_parts_master_slave.inc + +DROP TABLE t1; +--source include/sync_slave_sql_with_master.inc + +## CLEAN UP -- connection master SET GLOBAL binlog_row_image= @old_binlog_row_image; SET SESSION binlog_row_image= @old_binlog_row_image; diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all-slave.opt mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all-slave.opt --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all-slave.opt 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all-slave.opt 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1 @@ +--slave-skip-errors=all --log_warnings=2 diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_row_slave_skip_error_all.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,80 @@ +# ==== Purpose ==== +# +# Check that slave-skip-errors skips following errors like +# ER_SLAVE_CONVERSION_FAILED and ER_NO_SUCH_TABLE. +# +# ==== Implementation ==== +# On slave, set slave_skip_errors=all, so that slave skips all the errors that +# are reported during application of row based events. +# +# On master, create a table t with a varchar filed of length 25. On slave +# increase the varchar field width to 255, so that updates that are received +# from master will fail on slave with error ER_SLAVE_CONVERSION_FAILED. +# +# Secondly drop the table t on slave and try to the update the table from +# master. The updates will fail on slave with an error ER_NO_SUCH_TABLE. +# +# Verify that slave doesn't break inspite of these errors. +# ==== References ==== +# +# Bug#17653275:--SLAVE-SKIP-ERRORS WON'T SKIP MISSING DATABASE/TABLE +################################################################################ +--source include/have_debug.inc +--source include/have_binlog_format_row.inc +--source include/master-slave.inc + +# On master create table t which contains a field named 'name' with length +# varchar(25). +CREATE TABLE t (name VARCHAR(25) DEFAULT NULL) ENGINE=InnoDB; +--source include/sync_slave_sql_with_master.inc + +# On slave alter the name field length to varchar(255). +call mtr.add_suppression("Slave SQL.*Error executing row event: .Table .test.t. doesn.t exist., Error_code: 1146"); +call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); +call mtr.add_suppression("Got error 1 during COMMIT"); +ALTER TABLE t CHANGE name name VARCHAR(255); + +--source include/rpl_connection_master.inc +INSERT INTO t VALUE ('Amy'); +--echo # Sync should be successful. Slave should not stop with an error +--echo # ER_SLAVE_CONVERSION_FAILED. It should be up and running in spite +--echo # of errors as we have set slave_skip_error=all. +--source include/sync_slave_sql_with_master.inc + +# Drop the table t on slave. +DROP TABLE t; + +--source include/rpl_connection_master.inc +UPDATE t SET name='New'; +--echo # Sync should be successful. Slave should not stop with an error +--echo # ER_NO_SUCH_TABLE. It should be up and running in spite of errors +--echo # as we have set slave_skip_error=all. +--source include/sync_slave_sql_with_master.inc + +--echo # Enable a debug point to simulate failure during rows event cleanup. +--let $debug_saved= `SELECT @@GLOBAL.DEBUG` +SET @@GLOBAL.DEBUG= 'd,simulate_rows_event_cleanup_failure'; + +--source include/rpl_connection_master.inc +UPDATE t SET name='Old'; +--source include/rpl_connection_slave.inc +--echo # Since this is not an ignored error slave should stop. We only ignore the +--echo # errors that are generated during the execution of an event. The other errors +--echo # that are generated during commit/rollback failure, which takes place during cleanup +--echo # cannot be ignored. +--let $slave_sql_errno= convert_error(ER_ERROR_DURING_COMMIT); +--source include/wait_for_slave_sql_error.inc +--echo ==== Clean up ==== +SET @@GLOBAL.DEBUG= '$debug_saved'; +--source include/stop_slave_io.inc +RESET MASTER; +RESET SLAVE; +--source include/start_slave.inc + +--source include/rpl_connection_master.inc +--source include/sync_slave_sql_with_master.inc + +--source include/rpl_connection_master.inc +DROP TABLE t; +--source include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_server_uuid.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_server_uuid.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_server_uuid.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_server_uuid.test 2016-08-26 11:22:35.000000000 +0000 @@ -22,7 +22,7 @@ CALL mtr.add_suppression("Master's UUID has changed, although this should not happen unless you have changed it manually"); CALL mtr.add_suppression("Slave I/O: SET @master_heartbeat_period to master failed with error: Lost connection to MySQL server during query"); CALL mtr.add_suppression("Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error"); -CALL mtr.add_suppression("A slave with the same server_uuid as this slave has connected to the master"); +CALL mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master"); --let $uuid_file= auto.cnf @@ -299,7 +299,7 @@ --let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err # Assert only the occurrences after the last CHANGE MASTER --let $assert_only_after=CHANGE MASTER .* executed ---let $assert_select= Slave .* Got fatal error .* from master .* slave with the same server_uuid as this slave +--let $assert_select= Slave .* Got fatal error .* from master .* slave with the same server_uuid/server_id as this slave --let $assert_text= Found the expected line in server 2 error log --source include/assert_grep.inc diff -Nru mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test --- mysql-5.6-5.6.31/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/suite/rpl/t/rpl_zombie_dump_threads.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,59 @@ +############################################################################### +# Bug#21179199 ZOMBIE DUMP THREADS ARE NOT DISCONNECTED, +# CAN ALSO LEAD TO A CRASH +# +# Problem: Zombie dump threads on Master (>= MySQL-5.6 version) +# that are created to server slaves which are on lower +# versions than MySQL-5.6 version are not getting killed. +# Steps to reproduce: +# +# 1) A simulation point on slave to fake that server MySQL version is lower +# than MySQL-5.6 (i.e., no slave_uuid set in initial replication protocol) +# +# 2) Start IO thread on Slave which will start a dump thread on Master. +# +# 3) Restart the IO thread (Master should kill existing dump thread before +# starting a new dump thread) +# +# 4) Now count the number of dump threads on Master, it should be only '1'. +# +############################################################################### +--source include/have_debug.inc +--source include/have_binlog_format_statement.inc +--let rpl_skip_start_slave= 1 +--source include/master-slave.inc + +# When this test script is running in combination with other tests, +# it is possible that dump threads from those tests are not killed. +# (rpl_end.inc does not kill dump threads). +# Hence doing the cleanup here as this test depends on counting the +# active dump threads. +--source include/stop_dump_threads.inc + +# Step-1) A simulation point on slave to fake that server MySQL version +# is lower than MySQL-5.6 (i.e., no slave_uuid set in initial replication +# protocol). +--source include/rpl_connection_slave.inc +SET @save_debug = @@GLOBAL.debug; +SET GLOBAL debug="d,fake_5_5_version_slave"; + +# Step-2) Start IO thread on Slave which will start a dump thread on Master. +--source include/start_slave_io.inc + +# Step-3) Restart the IO thread (Master should kill existing dump thread before +# starting a new dump thread) +--source include/stop_slave_io.inc +--source include/start_slave_io.inc + +# Step-4) Count the number of dump threads on Master, it should be eventually +# become '1'. +--source include/rpl_connection_master.inc +--let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE COMMAND LIKE 'Binlog Dump%' +--source include/wait_condition.inc + +# Cleanup +--source include/rpl_connection_slave.inc +SET GLOBAL debug=@save_debug; +# We do not care about SQL thread for this test scenario +--let $rpl_only_running_threads= 1 +--source include/rpl_end.inc diff -Nru mysql-5.6-5.6.31/mysql-test/t/innodb_explain_json_non_select_all.test mysql-5.6-5.6.33/mysql-test/t/innodb_explain_json_non_select_all.test --- mysql-5.6-5.6.31/mysql-test/t/innodb_explain_json_non_select_all.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/innodb_explain_json_non_select_all.test 2016-08-26 11:22:35.000000000 +0000 @@ -22,12 +22,10 @@ set session default_storage_engine = InnoDB; --let $innodb = 1 -# Next 2 variables control the JSON format output and validation in explain_utils. +# Next variable controls the JSON format output in explain_utils. # 1 = enable, 0 = disable --let $json = 1 -# Validation disabled due to not having Python with JSON on all PB machines. ---let $validation = 0 ---file_exists $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py +--file_exists $MYSQL_TEST_DIR/suite/opt_trace/validate_json.pl --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/innodb_explain_json_non_select_none.test mysql-5.6-5.6.33/mysql-test/t/innodb_explain_json_non_select_none.test --- mysql-5.6-5.6.31/mysql-test/t/innodb_explain_json_non_select_none.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/innodb_explain_json_non_select_none.test 2016-08-26 11:22:35.000000000 +0000 @@ -30,11 +30,9 @@ set @save_storage_engine= @@session.default_storage_engine; set session default_storage_engine = InnoDB; --let $innodb = 1 -# Next 2 variables control the JSON format output and validation in explain_utils. +# Next variable controls the JSON format output in explain_utils. # 1 = enable, 0 = disable --let $json = 1 -# Validation disabled due to not having Python with JSON on all PB machines. ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/innodb_explain_non_select_all.test mysql-5.6-5.6.33/mysql-test/t/innodb_explain_non_select_all.test --- mysql-5.6-5.6.31/mysql-test/t/innodb_explain_non_select_all.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/innodb_explain_non_select_all.test 2016-08-26 11:22:35.000000000 +0000 @@ -20,9 +20,8 @@ set session default_storage_engine = InnoDB; --let $innodb = 1 -# json validation in explain_util.inc can be switched off by setting to zero. +# json format in explain_util.inc can be switched off by setting to zero. --let $json = 0 ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/innodb_explain_non_select_none.test mysql-5.6-5.6.33/mysql-test/t/innodb_explain_non_select_none.test --- mysql-5.6-5.6.31/mysql-test/t/innodb_explain_non_select_none.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/innodb_explain_non_select_none.test 2016-08-26 11:22:35.000000000 +0000 @@ -29,7 +29,6 @@ set session default_storage_engine = InnoDB; --let $innodb = 1 --let $json = 0 ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/loaddata.test mysql-5.6-5.6.33/mysql-test/t/loaddata.test --- mysql-5.6-5.6.31/mysql-test/t/loaddata.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/loaddata.test 2016-08-26 11:22:35.000000000 +0000 @@ -610,7 +610,7 @@ --echo # CREATE TABLE t1(f1 INT); -EVAL SELECT 0xE1BB30 INTO OUTFILE 't1.dat'; +EVAL SELECT 0xE1C330 INTO OUTFILE 't1.dat'; --disable_warnings LOAD DATA INFILE 't1.dat' IGNORE INTO TABLE t1 CHARACTER SET utf8; --enable_warnings @@ -656,3 +656,26 @@ --remove_file $MYSQLTEST_VARDIR/mysql DROP TABLE t1; +--echo +--echo # +--echo # Bug#23080148 - Backport of Bug#20683959. +--echo # Bug#20683959 LOAD DATA INFILE IGNORES A SPECIFIC ROW SILENTLY +--echo # UNDER DB CHARSET IS UTF8. +--echo # + +CREATE DATABASE d1 CHARSET latin1; +USE d1; +CREATE TABLE t1 (val TEXT); +LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1; +SELECT COUNT(*) FROM t1; +SELECT HEX(val) FROM t1; + +CREATE DATABASE d2 CHARSET utf8; +USE d2; +CREATE TABLE t1 (val TEXT); +--error ER_INVALID_CHARACTER_STRING +LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1; + +DROP TABLE d1.t1, d2.t1; +DROP DATABASE d1; +DROP DATABASE d2; diff -Nru mysql-5.6-5.6.31/mysql-test/t/myisam_explain_json_non_select_all.test mysql-5.6-5.6.33/mysql-test/t/myisam_explain_json_non_select_all.test --- mysql-5.6-5.6.31/mysql-test/t/myisam_explain_json_non_select_all.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/myisam_explain_json_non_select_all.test 2016-08-26 11:22:35.000000000 +0000 @@ -15,11 +15,9 @@ set @save_storage_engine= @@session.default_storage_engine; set session default_storage_engine = MyISAM; -# Next 2 variables control the JSON format output and validation in explain_utils. +# Next variable controls the JSON format output in explain_utils. # 1 = enable, 0 = disable --let $json = 1 -# Validation disabled due to not having Python with JSON on all PB machines. ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/myisam_explain_json_non_select_none.test mysql-5.6-5.6.33/mysql-test/t/myisam_explain_json_non_select_none.test --- mysql-5.6-5.6.31/mysql-test/t/myisam_explain_json_non_select_none.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/myisam_explain_json_non_select_none.test 2016-08-26 11:22:35.000000000 +0000 @@ -25,11 +25,9 @@ set @save_storage_engine= @@session.default_storage_engine; set session default_storage_engine = MyISAM; -# Next 2 variables control the JSON format output and validation in explain_utils. +# Next variable controls the JSON format output in explain_utils. # 1 = enable, 0 = disable --let $json = 1 -# Validation disabled due to not having Python with JSON on all PB machines. ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/myisam_explain_non_select_all.test mysql-5.6-5.6.33/mysql-test/t/myisam_explain_non_select_all.test --- mysql-5.6-5.6.31/mysql-test/t/myisam_explain_non_select_all.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/myisam_explain_non_select_all.test 2016-08-26 11:22:35.000000000 +0000 @@ -14,7 +14,6 @@ set @save_storage_engine= @@session.default_storage_engine; set session default_storage_engine = MyISAM; --let $json = 0 ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/myisam_explain_non_select_none.test mysql-5.6-5.6.33/mysql-test/t/myisam_explain_non_select_none.test --- mysql-5.6-5.6.31/mysql-test/t/myisam_explain_non_select_none.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/myisam_explain_non_select_none.test 2016-08-26 11:22:35.000000000 +0000 @@ -24,7 +24,6 @@ set @save_storage_engine= @@session.default_storage_engine; set session default_storage_engine = MyISAM; --let $json = 0 ---let $validation = 0 --source include/explain_non_select.inc set default_storage_engine= @save_storage_engine; diff -Nru mysql-5.6-5.6.31/mysql-test/t/mysqlbinlog.test mysql-5.6-5.6.33/mysql-test/t/mysqlbinlog.test --- mysql-5.6-5.6.31/mysql-test/t/mysqlbinlog.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/mysqlbinlog.test 2016-08-26 11:22:35.000000000 +0000 @@ -374,7 +374,7 @@ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval SELECT (@a:=LOAD_FILE("$binlog_file")) -IS NOT NULL; +IS NOT NULL AS Loaded; let $s_id_unsigned= `SELECT @a LIKE "%server id $s_id_max%" /* must return 1 */`; echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; diff -Nru mysql-5.6-5.6.31/mysql-test/t/mysql_client_test_qcache-master.opt mysql-5.6-5.6.33/mysql-test/t/mysql_client_test_qcache-master.opt --- mysql-5.6-5.6.31/mysql-test/t/mysql_client_test_qcache-master.opt 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/mysql_client_test_qcache-master.opt 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1 @@ +--query_cache_type=1 diff -Nru mysql-5.6-5.6.31/mysql-test/t/mysql_client_test_qcache.test mysql-5.6-5.6.33/mysql-test/t/mysql_client_test_qcache.test --- mysql-5.6-5.6.31/mysql-test/t/mysql_client_test_qcache.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/mysql_client_test_qcache.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,21 @@ +# This test should work in embedded server after we fix mysqltest +-- source include/not_embedded.inc + +--echo # Bug#22559575 "the statement (1) has no open cursor" pops sometimes with +--echo # prepared+query_cache +--echo # +--echo # Create relevent tables and call C API test cases +--echo # Setup + +select VARIABLE_VALUE into @qcache_hit_val1 from + information_schema.GLOBAL_STATUS where VARIABLE_NAME = 'Qcache_hits'; + +--echo +--echo #Run C_API test case +--exec echo "$MYSQL_CLIENT_TEST --silent test_bug22559575" > $MYSQLTEST_VARDIR/log/mysql_client_test_qcache.out.log 2>&1 +--exec $MYSQL_CLIENT_TEST --silent test_bug22559575 >> $MYSQLTEST_VARDIR/log/mysql_client_test_qcache.out.log 2>&1 + +select VARIABLE_VALUE into @qcache_hit_val2 from + information_schema.GLOBAL_STATUS where VARIABLE_NAME = 'Qcache_hits'; +SELECT @qcache_hit_val2 - @qcache_hit_val1; + diff -Nru mysql-5.6-5.6.31/mysql-test/t/sp-prelocking.test mysql-5.6-5.6.33/mysql-test/t/sp-prelocking.test --- mysql-5.6-5.6.31/mysql-test/t/sp-prelocking.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/sp-prelocking.test 2016-08-26 11:22:35.000000000 +0000 @@ -388,3 +388,41 @@ --echo End of 5.0 tests +--echo # +--echo # Bug#21142859: FUNCTION UPDATING A VIEW FAILS TO FIND TABLE THAT ACTUALLY EXISTS +--echo # + +CREATE TABLE t1 SELECT 1 AS fld1, 'A' AS fld2; +CREATE TABLE t2 (fld3 INT, fld4 CHAR(1)); + +CREATE VIEW v1 AS SELECT * FROM t1; + +CREATE TRIGGER t1_au AFTER UPDATE ON t1 +FOR EACH ROW INSERT INTO t2 VALUES (new.fld1, new.fld2); + +DELIMITER !; +CREATE FUNCTION f1() RETURNS INT +BEGIN + UPDATE v1 SET fld2='B' WHERE fld1=1; + RETURN row_count(); +END ! +DELIMITER ;! + +--echo # Without the patch, an error was getting reported. +SELECT f1(); + +DROP FUNCTION f1; +DROP VIEW v1; +DROP TABLE t1,t2; + +--echo # +--echo # Bug #16672723 "CAN'T FIND TEMPORARY TABLE". +--echo # +CREATE FUNCTION f1() RETURNS INT RETURN 1; +CREATE TEMPORARY TABLE tmp1(a INT); +PREPARE stmt1 FROM "CREATE TEMPORARY TABLE tmp2 AS SELECT b FROM (SELECT f1() AS b FROM tmp1) AS t"; +--echo # The below statement failed before the fix. +EXECUTE stmt1; +DROP TEMPORARY TABLES tmp1, tmp2; +DEALLOCATE PREPARE stmt1; +DROP FUNCTION f1; diff -Nru mysql-5.6-5.6.31/mysql-test/t/variables-win.test mysql-5.6-5.6.33/mysql-test/t/variables-win.test --- mysql-5.6-5.6.31/mysql-test/t/variables-win.test 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/variables-win.test 2016-08-26 11:22:35.000000000 +0000 @@ -0,0 +1,15 @@ +--source include/windows.inc + + +--echo # +--echo # Bug #23747899: @@basedir sysvar value not normalized if set through +--echo # the command line/ini file + +--echo # There should be no slashes in @@basedir and just backslashes +--echo # since it's normalized +SELECT + LOCATE('/', @@basedir) <> 0 AS have_slashes, + LOCATE('\\', @@basedir) <> 0 AS have_backslashes; + + +--echo End of the 5.6 tests diff -Nru mysql-5.6-5.6.31/mysql-test/t/wl6443_deprecation.test mysql-5.6-5.6.33/mysql-test/t/wl6443_deprecation.test --- mysql-5.6-5.6.31/mysql-test/t/wl6443_deprecation.test 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysql-test/t/wl6443_deprecation.test 2016-08-26 11:22:35.000000000 +0000 @@ -80,6 +80,9 @@ my $count_warnings= $count_warnings; print "Deprecation warning count : $count_warnings\n"; close(FILE); + # Truncate the log file so that repititions of the test don't pick up deprecation warnings from previous runs + open(FILE,">$logf") or die("Unable to open $logf for truncation $!\n"); + close(FILE); EOF -- source include/mysql_upgrade_preparation.inc diff -Nru mysql-5.6-5.6.31/mysys/my_redel.c mysql-5.6-5.6.33/mysys/my_redel.c --- mysql-5.6-5.6.31/mysys/my_redel.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysys/my_redel.c 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,6 +35,9 @@ if MY_REDEL_MAKE_COPY is given, then the orginal file is renamed to org_name-'current_time'.BAK + + if MY_REDEL_NO_COPY_STAT is given, stats are not copied + from org_name to tmp_name. */ #define REDEL_EXT ".BAK" @@ -46,8 +49,11 @@ DBUG_PRINT("my",("org_name: '%s' tmp_name: '%s' MyFlags: %d", org_name,tmp_name,MyFlags)); - if (my_copystat(org_name,tmp_name,MyFlags) < 0) - goto end; + if (!(MyFlags & MY_REDEL_NO_COPY_STAT)) + { + if (my_copystat(org_name,tmp_name,MyFlags) < 0) + goto end; + } if (MyFlags & MY_REDEL_MAKE_BACKUP) { char name_buff[FN_REFLEN+20]; diff -Nru mysql-5.6-5.6.31/mysys_ssl/my_default.cc mysql-5.6-5.6.33/mysys_ssl/my_default.cc --- mysql-5.6-5.6.31/mysys_ssl/my_default.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/mysys_ssl/my_default.cc 2016-08-26 11:22:35.000000000 +0000 @@ -106,16 +106,8 @@ static char my_defaults_file_buffer[FN_REFLEN]; static char my_defaults_extra_file_buffer[FN_REFLEN]; -static char my_login_file[FN_REFLEN]; - static my_bool defaults_already_read= FALSE; -/* Set to TRUE, if --no-defaults is found. */ -static my_bool found_no_defaults= FALSE; - -/* Set to TRUE, when login file is being processed. */ -static my_bool is_login_file= FALSE; - /* Which directories are searched for options (and in which order) */ #define MAX_DEFAULT_DIRS 6 @@ -148,13 +140,16 @@ }; static int search_default_file(Process_option_func func, void *func_ctx, - const char *dir, const char *config_file); + const char *dir, const char *config_file, + my_bool is_login_file); static int search_default_file_with_ext(Process_option_func func, void *func_ctx, const char *dir, const char *ext, - const char *config_file, int recursion_level); -static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file); - + const char *config_file, + int recursion_level, + my_bool is_login_file); +static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file, + my_bool is_login_file); /** Create the list of default directories. @@ -230,6 +225,7 @@ func_ctx It's context. Usually it is the structure to store additional options. default_directories List of default directories. + found_no_defaults TRUE, if --no-defaults is specified. DESCRIPTION Process the default options from argc & argv @@ -253,7 +249,8 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, uint *args_used, Process_option_func func, - void *func_ctx, const char **default_directories) + void *func_ctx, const char **default_directories, + my_bool is_login_file, my_bool found_no_defaults) { const char **dirs, *forced_default_file, *forced_extra_defaults; int error= 0; @@ -267,7 +264,7 @@ (char **) &forced_default_file, (char **) &forced_extra_defaults, (char **) &my_defaults_group_suffix, - (char **) &my_login_path); + (char **) &my_login_path, found_no_defaults); if (! my_defaults_group_suffix) my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV)); @@ -382,14 +379,16 @@ // If conf_file is an absolute path, we only read it if (dirname_length(conf_file)) { - if ((error= search_default_file(func, func_ctx, NullS, conf_file)) < 0) - goto err; + if ((error= search_default_file(func, func_ctx, NullS, conf_file, + is_login_file)) < 0) + goto err; } // If my defaults file is set (from a previous run), we read it else if (my_defaults_file) { if ((error= search_default_file_with_ext(func, func_ctx, "", "", - my_defaults_file, 0)) < 0) + my_defaults_file, 0, + is_login_file)) < 0) goto err; if (error > 0) { @@ -404,14 +403,16 @@ { if (**dirs) { - if (search_default_file(func, func_ctx, *dirs, conf_file) < 0) - goto err; + if (search_default_file(func, func_ctx, *dirs, conf_file, + is_login_file) < 0) + goto err; } else if (my_defaults_extra_file) { if ((error= search_default_file_with_ext(func, func_ctx, "", "", - my_defaults_extra_file, 0)) < 0) - goto err; /* Fatal error */ + my_defaults_extra_file, 0, + is_login_file)) < 0) + goto err; /* Fatal error */ if (error > 0) { fprintf(stderr, "Could not open required defaults file: %s\n", @@ -499,7 +500,8 @@ char **defaults, char **extra_defaults, char **group_suffix, - char **login_path) + char **login_path, + my_bool found_no_defaults) { int org_argc= argc, prev_argc= 0, default_option_count= 0; *defaults= *extra_defaults= *group_suffix= *login_path= 0; @@ -626,6 +628,8 @@ char *ptr,**res; struct handle_option_ctx ctx; const char **dirs; + char my_login_file[FN_REFLEN]; + my_bool found_no_defaults= false; uint args_sep= my_getopt_use_args_separator ? 1 : 0; DBUG_ENTER("load_defaults"); @@ -655,23 +659,21 @@ if ((error= my_search_option_files(conf_file, argc, argv, &args_used, handle_default_option, - (void *) &ctx, dirs))) + (void *) &ctx, dirs, false, found_no_defaults))) { free_root(&alloc,MYF(0)); DBUG_RETURN(error); } /* Read options from login group. */ - is_login_file= TRUE; if (my_default_get_login_file(my_login_file, sizeof(my_login_file)) && (error= my_search_option_files(my_login_file,argc, argv, &args_used, handle_default_option, (void *) &ctx, - dirs))) + dirs, true, found_no_defaults))) { free_root(&alloc,MYF(0)); DBUG_RETURN(error); } - is_login_file= FALSE; /* Here error contains <> 0 only if we have a fully specified conf_file @@ -754,7 +756,8 @@ static int search_default_file(Process_option_func opt_handler, void *handler_ctx, const char *dir, - const char *config_file) + const char *config_file, + my_bool is_login_file) { char **ext; const char *empty_list[]= { "", 0 }; @@ -766,7 +769,7 @@ int error; if ((error= search_default_file_with_ext(opt_handler, handler_ctx, dir, *ext, - config_file, 0)) < 0) + config_file, 0, is_login_file)) < 0) return error; } return 0; @@ -838,6 +841,7 @@ group groups to read recursion_level the level of recursion, got while processing "!include" or "!includedir" + is_login_file TRUE, when login file is being processed. RETURN 0 Success @@ -850,7 +854,8 @@ const char *dir, const char *ext, const char *config_file, - int recursion_level) + int recursion_level, + my_bool is_login_file) { char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext; char *value, option[4096+2], tmp[FN_REFLEN]; @@ -879,7 +884,7 @@ } fn_format(name,name,"","",4); - if ((rc= check_file_permissions(name)) < 2) + if ((rc= check_file_permissions(name, is_login_file)) < 2) return (int) rc; if (is_login_file) @@ -894,7 +899,7 @@ return 1; /* Ignore wrong files */ } - while (mysql_file_getline(buff, sizeof(buff) - 1, fp)) + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { line++; /* Ignore comment and empty lines */ @@ -955,7 +960,7 @@ MY_UNPACK_FILENAME | MY_SAFE_PATH); search_default_file_with_ext(opt_handler, handler_ctx, "", "", tmp, - recursion_level + 1); + recursion_level + 1, is_login_file); } } @@ -970,7 +975,7 @@ goto err; search_default_file_with_ext(opt_handler, handler_ctx, "", "", ptr, - recursion_level + 1); + recursion_level + 1, is_login_file); } continue; @@ -1132,15 +1137,17 @@ of scrambled login file, the line read is first decrypted and then returned. - @param str [out] Buffer to store the read text. - @param size [in] At max, size-1 bytes to be read. - @param file [in] Source file. + @param str [out] Buffer to store the read text. + @param size [in] At max, size-1 bytes to be read. + @param file [in] Source file. + @param is_login_file [in] TRUE, when login file is being processed. @return 1 Success 0 Error */ -static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file) +static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file, + my_bool is_login_file) { uchar cipher[4096], len_buf[MAX_CIPHER_STORE_LEN]; static unsigned char my_key[LOGIN_KEY_LEN]; @@ -1453,13 +1460,14 @@ /** Check file permissions of the option file. - @param file_name [in] Name of the option file. + @param file_name [in] Name of the option file. + @param is_login_file [in] TRUE, when login file is being processed. @return 0 - Non-allowable file permissions. 1 - Failed to stat. 2 - Success. */ -int check_file_permissions(const char *file_name) +int check_file_permissions(const char *file_name, my_bool is_login_file) { #if !defined(__WIN__) MY_STAT stat_info; diff -Nru mysql-5.6-5.6.31/packaging/rpm-fedora/mysql.spec.in mysql-5.6-5.6.33/packaging/rpm-fedora/mysql.spec.in --- mysql-5.6-5.6.31/packaging/rpm-fedora/mysql.spec.in 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/packaging/rpm-fedora/mysql.spec.in 2016-08-26 11:22:35.000000000 +0000 @@ -54,6 +54,8 @@ %global license_type GPLv2 %endif +%global min 5.6.10 + Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases @@ -113,10 +115,10 @@ Requires: net-tools %if 0%{?commercial} Obsoletes: mysql-community-server < %{version}-%{release} -Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-client%{?_isa} >= %{min} Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} %else -Requires: mysql-community-client%{?_isa} = %{version}-%{release} +Requires: mysql-community-client%{?_isa} >= %{min} Requires: mysql-community-common%{?_isa} = %{version}-%{release} %endif Obsoletes: mariadb-server @@ -158,9 +160,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-client < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-libs%{?_isa} >= %{min} %else -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} >= %{min} %endif Obsoletes: mariadb Obsoletes: community-mysql < %{version}-%{release} @@ -196,10 +198,10 @@ Summary: Test suite for the MySQL database server Group: Applications/Databases %if 0%{?commercial} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-server%{?_isa} >= %{min} Obsoletes: mysql-community-test < %{version}-%{release} %else -Requires: mysql-community-server%{?_isa} = %{version}-%{release} +Requires: mysql-community-server%{?_isa} >= %{min} %endif Obsoletes: mariadb-test Obsoletes: community-mysql-test < %{version}-%{release} @@ -217,9 +219,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-bench < %{version}-%{release} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-server%{?_isa} >= %{min} %else -Requires: mysql-community-server%{?_isa} = %{version}-%{release} +Requires: mysql-community-server%{?_isa} >= %{min} %endif Obsoletes: mariadb-bench Obsoletes: community-mysql-bench < %{obs_ver} @@ -236,9 +238,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-devel < %{version}-%{release} -Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-libs%{?_isa} >= %{min} %else -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} >= %{min} %endif Obsoletes: mariadb-devel Obsoletes: community-mysql-devel < %{obs_ver} @@ -255,9 +257,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-libs < %{version}-%{release} -Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-common%{?_isa} >= %{min} %else -Requires: mysql-community-common%{?_isa} = %{version}-%{release} +Requires: mysql-community-common%{?_isa} >= %{min} %endif Obsoletes: mariadb-libs Obsoletes: community-mysql-libs < %{version}-%{release} @@ -301,11 +303,11 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-embedded-devel < %{version}-%{release} -Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-devel%{?_isa} >= %{min} +Requires: mysql-commercial-embedded%{?_isa} >= %{min} %else -Requires: mysql-community-devel%{?_isa} = %{version}-%{release} -Requires: mysql-community-embedded%{?_isa} = %{version}-%{release} +Requires: mysql-community-devel%{?_isa} >= %{min} +Requires: mysql-community-embedded%{?_isa} >= %{min} %endif Obsoletes: mariadb-embedded-devel Obsoletes: community-mysql-embedded-devel < %{version}-%{release} @@ -459,6 +461,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1) /bin/chmod 0755 "$datadir" >/dev/null 2>&1 || : /bin/touch /var/log/mysqld.log >/dev/null 2>&1 || : +/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || : %systemd_post mysqld.service /usr/bin/systemctl enable mysqld >/dev/null 2>&1 || : @@ -626,8 +629,6 @@ %attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlshow %attr(755, root, root) %{_bindir}/mysqlslap -%attr(755, root, root) %{_bindir}/mysql_config -%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits} %attr(755, root, root) %{_bindir}/mysql_config_editor %attr(644, root, root) %{_mandir}/man1/msql2mysql.1* @@ -719,6 +720,9 @@ %attr(755, root, root) %{_libdir}/mysql/libmysqld.so %changelog +* Tue Jul 05 2016 Balasubramanian Kandasamy - 5.6.32-1 +- Remove mysql_config from client subpackage + * Mon Mar 14 2016 Georgi Kodinov - 5.6.31-1 - Add test_udf_services.so plugin diff -Nru mysql-5.6-5.6.31/packaging/rpm-oel/mysql.init mysql-5.6-5.6.33/packaging/rpm-oel/mysql.init --- mysql-5.6-5.6.31/packaging/rpm-oel/mysql.init 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/packaging/rpm-oel/mysql.init 2016-08-26 11:22:35.000000000 +0000 @@ -102,7 +102,7 @@ # alarms, per bug #547485 $exec --datadir="$datadir" --socket="$socketfile" \ --pid-file="$mypidfile" \ - --basedir=/usr --user=mysql >/dev/null 2>&1 & + --basedir=/usr --user=mysql >/dev/null & safe_pid=$! # Spin for a maximum of N seconds waiting for the server to come up; # exit the loop immediately if mysqld_safe process disappears. diff -Nru mysql-5.6-5.6.31/packaging/rpm-oel/mysql.spec.in mysql-5.6-5.6.33/packaging/rpm-oel/mysql.spec.in --- mysql-5.6-5.6.31/packaging/rpm-oel/mysql.spec.in 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/packaging/rpm-oel/mysql.spec.in 2016-08-26 11:22:35.000000000 +0000 @@ -81,6 +81,8 @@ %global license_type GPLv2 %endif +%global min 5.6.10 + Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases @@ -159,11 +161,11 @@ Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-server-advanced < %{version}-%{release} Obsoletes: mysql-community-server < %{version}-%{release} -Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-client%{?_isa} >= %{min} Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} %else Provides: MySQL-server%{?_isa} = %{version}-%{release} -Requires: mysql-community-client%{?_isa} = %{version}-%{release} +Requires: mysql-community-client%{?_isa} >= %{min} Requires: mysql-community-common%{?_isa} = %{version}-%{release} %endif Obsoletes: MySQL-server < %{version}-%{release} @@ -212,10 +214,10 @@ Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-client-advanced < %{version}-%{release} Obsoletes: mysql-community-client < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-libs%{?_isa} >= %{min} %else Provides: MySQL-client%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} >= %{min} %endif Obsoletes: MySQL-client < %{version}-%{release} Obsoletes: mariadb @@ -237,7 +239,7 @@ %endif Provides: mysql-common = %{version}-%{release} Provides: mysql-common%{?_isa} = %{version}-%{release} -%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} +%{?el5:Requires: mysql%{?_isa} >= %{min}} %description common This packages contains common files needed by MySQL client library, @@ -251,10 +253,10 @@ Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-test-advanced < %{version}-%{release} Obsoletes: mysql-community-test < %{version}-%{release} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-server%{?_isa} >= %{min} %else Provides: MySQL-test%{?_isa} = %{version}-%{release} -Requires: mysql-community-server%{?_isa} = %{version}-%{release} +Requires: mysql-community-server%{?_isa} >= %{min} %endif Obsoletes: MySQL-test < %{version}-%{release} Obsoletes: mysql-test < %{version}-%{release} @@ -272,9 +274,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-bench < %{version}-%{release} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-server%{?_isa} >= %{min} %else -Requires: mysql-community-server%{?_isa} = %{version}-%{release} +Requires: mysql-community-server%{?_isa} >= %{min} %endif Obsoletes: mariadb-bench Obsoletes: community-mysql-bench < %{version}-%{release} @@ -293,10 +295,10 @@ Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-devel-advanced < %{version}-%{release} Obsoletes: mysql-community-devel < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-libs%{?_isa} >= %{min} %else Provides: MySQL-devel%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} >= %{min} %endif Obsoletes: MySQL-devel < %{version}-%{release} Obsoletes: mysql-devel < %{version}-%{release} @@ -316,10 +318,10 @@ Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-shared-advanced < %{version}-%{release} Obsoletes: mysql-community-libs < %{version}-%{release} -Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-common%{?_isa} >= %{min} %else Provides: MySQL-shared%{?_isa} = %{version}-%{release} -Requires: mysql-community-common%{?_isa} = %{version}-%{release} +Requires: mysql-community-common%{?_isa} >= %{min} %endif Obsoletes: MySQL-shared < %{version}-%{release} Obsoletes: mysql-libs < %{version}-%{release} @@ -343,10 +345,10 @@ Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release} Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release} Obsoletes: mysql-community-libs-compat < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-libs%{?_isa} >= %{min} %else Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} >= %{min} %endif Obsoletes: MySQL-shared-compat < %{version}-%{release} %if 0%{?rhel} > 5 @@ -393,11 +395,11 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-embedded-devel < %{version}-%{release} -Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-devel%{?_isa} >= %{min} +Requires: mysql-commercial-embedded%{?_isa} >= %{min} %else -Requires: mysql-community-devel%{?_isa} = %{version}-%{release} -Requires: mysql-community-embedded%{?_isa} = %{version}-%{release} +Requires: mysql-community-devel%{?_isa} >= %{min} +Requires: mysql-community-embedded%{?_isa} >= %{min} %endif Obsoletes: mariadb-embedded-devel Obsoletes: mysql-embedded-devel < %{version}-%{release} @@ -413,13 +415,13 @@ Summary: Convenience package for easy upgrades of MySQL package set Group: Applications/Databases %if 0%{?commercial} -Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-libs-compat%{?_isa} = %{version}-%{release} -%else -Requires: mysql-community-client%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release} +Requires: mysql-commercial-client%{?_isa} >= %{min} +Requires: mysql-commercial-libs%{?_isa} >= %{min} +Requires: mysql-commercial-libs-compat%{?_isa} >= %{min} +%else +Requires: mysql-community-client%{?_isa} >= %{min} +Requires: mysql-community-libs%{?_isa} >= %{min} +Requires: mysql-community-libs-compat%{?_isa} >= %{min} %endif %description -n mysql @@ -633,6 +635,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1) /bin/chmod 0755 "$datadir" >/dev/null 2>&1 || : /bin/touch /var/log/mysqld.log >/dev/null 2>&1 || : +/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || : %if 0%{?systemd} %systemd_post mysqld.service /usr/bin/systemctl enable mysqld >/dev/null 2>&1 || : @@ -859,8 +862,6 @@ %attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlshow %attr(755, root, root) %{_bindir}/mysqlslap -%attr(755, root, root) %{_bindir}/mysql_config -%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits} %attr(755, root, root) %{_bindir}/mysql_config_editor %attr(644, root, root) %{_mandir}/man1/msql2mysql.1* @@ -951,6 +952,9 @@ %endif %changelog +* Tue Jul 05 2016 Balasubramanian Kandasamy - 5.6.32-1 +- Remove mysql_config from client subpackage + * Mon Mar 14 2016 Georgi Kodinov - 5.6.31-1 - Add test_udf_services.so plugin diff -Nru mysql-5.6-5.6.31/packaging/rpm-sles/mysql.init mysql-5.6-5.6.33/packaging/rpm-sles/mysql.init --- mysql-5.6-5.6.31/packaging/rpm-sles/mysql.init 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/packaging/rpm-sles/mysql.init 2016-08-26 11:22:35.000000000 +0000 @@ -153,7 +153,7 @@ rc_failed 6 ; rc_status -v ; rc_exit fi - $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null 2>&1 & + $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null & if pinger $! ; then echo -n "Starting service MySQL:" touch $lockfile diff -Nru mysql-5.6-5.6.31/packaging/rpm-sles/mysql.spec.in mysql-5.6-5.6.33/packaging/rpm-sles/mysql.spec.in --- mysql-5.6-5.6.31/packaging/rpm-sles/mysql.spec.in 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/packaging/rpm-sles/mysql.spec.in 2016-08-26 11:22:35.000000000 +0000 @@ -66,6 +66,8 @@ %{?sles12: %global systemd 1} %{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d} +%global min 5.6.10 + Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases @@ -136,12 +138,12 @@ Provides: MySQL-server-advanced = %{version}-%{release} Obsoletes: MySQL-server-advanced < %{version}-%{release} Obsoletes: mysql-community-server < %{version}-%{release} -Requires: mysql-commercial-client = %{version}-%{release} -Requires: mysql-commercial-common = %{version}-%{release} +Requires: mysql-commercial-client >= %{min} +Requires: mysql-commercial-common >= %{min} %else Provides: MySQL-server = %{version}-%{release} -Requires: mysql-community-client = %{version}-%{release} -Requires: mysql-community-common = %{version}-%{release} +Requires: mysql-community-client >= %{min} +Requires: mysql-community-common >= %{min} %endif Obsoletes: MySQL-server < %{version}-%{release} Obsoletes: mysql < %{version}-%{release} @@ -189,10 +191,10 @@ Provides: MySQL-client-advanced = %{version}-%{release} Obsoletes: MySQL-client-advanced < %{version}-%{release} Obsoletes: mysql-community-client < %{version}-%{release} -Requires: mysql-commercial-libs = %{version}-%{release} +Requires: mysql-commercial-libs >= %{min} %else Provides: MySQL-client = %{version}-%{release} -Requires: mysql-community-libs = %{version}-%{release} +Requires: mysql-community-libs >= %{min} %endif Obsoletes: MySQL-client < %{version}-%{release} Provides: mysql-client = %{version}-%{release} @@ -224,10 +226,10 @@ Provides: MySQL-test-advanced = %{version}-%{release} Obsoletes: MySQL-test-advanced < %{version}-%{release} Obsoletes: mysql-community-test < %{version}-%{release} -Requires: mysql-commercial-server = %{version}-%{release} +Requires: mysql-commercial-server >= %{min} %else Provides: MySQL-test = %{version}-%{release} -Requires: mysql-community-server = %{version}-%{release} +Requires: mysql-community-server >= %{min} %endif Obsoletes: MySQL-test < %{version}-%{release} Obsoletes: mysql-test < %{version}-%{release} @@ -245,9 +247,9 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-bench < %{version}-%{release} -Requires: mysql-commercial-server = %{version}-%{release} +Requires: mysql-commercial-server >= %{min} %else -Requires: mysql-community-server = %{version}-%{release} +Requires: mysql-community-server >= %{min} %endif Obsoletes: mariadb-bench Obsoletes: community-mysql-bench < %{version}-%{release} @@ -266,10 +268,10 @@ Provides: MySQL-devel-advanced = %{version}-%{release} Obsoletes: MySQL-devel-advanced < %{version}-%{release} Obsoletes: mysql-community-devel < %{version}-%{release} -Requires: mysql-commercial-libs = %{version}-%{release} +Requires: mysql-commercial-libs >= %{min} %else Provides: MySQL-devel = %{version}-%{release} -Requires: mysql-community-libs = %{version}-%{release} +Requires: mysql-community-libs >= %{min} %endif Obsoletes: MySQL-devel < %{version}-%{release} Obsoletes: mysql-devel < %{version}-%{release} @@ -290,10 +292,10 @@ Provides: MySQL-shared-advanced = %{version}-%{release} Obsoletes: MySQL-shared-advanced < %{version}-%{release} Obsoletes: mysql-community-libs < %{version}-%{release} -Requires: mysql-commercial-common = %{version}-%{release} +Requires: mysql-commercial-common >= %{min} %else Provides: MySQL-shared = %{version}-%{release} -Requires: mysql-community-common = %{version}-%{release} +Requires: mysql-community-common >= %{min} %endif Obsoletes: MySQL-shared < %{version}-%{release} Obsoletes: mysql-libs < %{version}-%{release} @@ -316,10 +318,10 @@ Provides: MySQL-embedded-advanced = %{version}-%{release} Obsoletes: MySQL-embedded-advanced < %{version}-%{release} Obsoletes: mysql-community-embedded < %{version}-%{release} -Requires: mysql-commercial-common = %{version}-%{release} +Requires: mysql-commercial-common >= %{min} %else Provides: MySQL-embedded = %{version}-%{release} -Requires: mysql-community-common = %{version}-%{release} +Requires: mysql-community-common >= %{min} %endif Obsoletes: mariadb-embedded Obsoletes: MySQL-embedded < %{version}-%{release} @@ -343,11 +345,11 @@ Group: Applications/Databases %if 0%{?commercial} Obsoletes: mysql-community-embedded-devel < %{version}-%{release} -Requires: mysql-commercial-devel = %{version}-%{release} -Requires: mysql-commercial-embedded = %{version}-%{release} +Requires: mysql-commercial-devel >= %{min} +Requires: mysql-commercial-embedded >= %{min} %else -Requires: mysql-community-devel = %{version}-%{release} -Requires: mysql-community-embedded = %{version}-%{release} +Requires: mysql-community-devel >= %{min} +Requires: mysql-community-embedded >= %{min} %endif Obsoletes: mariadb-embedded-devel Obsoletes: mysql-embedded-devel < %{version}-%{release} @@ -507,6 +509,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1) /bin/chmod 0755 "$datadir" /bin/touch /var/log/mysql/mysqld.log +/bin/chown mysql:mysql /var/log/mysql/mysqld.log >/dev/null 2>&1 || : %if 0%{?systemd} %service_add_post mysql.service /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf >/dev/null 2>&1 || : @@ -717,7 +720,6 @@ %attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlshow %attr(755, root, root) %{_bindir}/mysqlslap -%attr(755, root, root) %{_bindir}/mysql_config %attr(755, root, root) %{_bindir}/mysql_config_editor %attr(644, root, root) %{_mandir}/man1/msql2mysql.1* diff -Nru mysql-5.6-5.6.31/regex/split.c mysql-5.6-5.6.33/regex/split.c --- mysql-5.6-5.6.31/regex/split.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/regex/split.c 2016-08-26 11:22:35.000000000 +0000 @@ -159,6 +159,10 @@ if (argc > 4) for (n = atoi(argv[3]); n > 0; n--) { + if(sizeof(buf)-1 < strlen(argv[1])) + { + exit(EXIT_FAILURE); + } (void) strcpy(buf, argv[1]); } else if (argc > 3) diff -Nru mysql-5.6-5.6.31/scripts/fill_help_tables.sql mysql-5.6-5.6.33/scripts/fill_help_tables.sql --- mysql-5.6-5.6.31/scripts/fill_help_tables.sql 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/scripts/fill_help_tables.sql 2016-08-26 11:32:53.000000000 +0000 @@ -17,9 +17,9 @@ -- team. If you require changes to the format of this file, contact the -- docs team. --- File generation date: 2016-05-16 +-- File generation date: 2016-08-25 -- MySQL series: 5.6 --- Document repository revision: 47742 +-- Document repository revision: 48695 -- To use this file, load its contents into the mysql database. For example, -- with the mysql client program, process the file like this, where @@ -77,7 +77,7 @@ INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (39,'Functions',36,''); INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (40,'Data Definition',36,''); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (0,28,'JOIN','MySQL supports the following JOIN syntaxes for the table_references\npart of SELECT statements and multiple-table DELETE and UPDATE\nstatements:\n\ntable_references:\n escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference:\n table_reference\n | { OJ table_reference }\n\ntable_reference:\n table_factor\n | join_table\n\ntable_factor:\n tbl_name [PARTITION (partition_names)] \n [[AS] alias] [index_hint_list]\n | table_subquery [AS] alias\n | ( table_references )\n\njoin_table:\n table_reference [INNER | CROSS] JOIN table_factor [join_condition]\n | table_reference STRAIGHT_JOIN table_factor\n | table_reference STRAIGHT_JOIN table_factor ON conditional_expr\n | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_condition\n | table_reference NATURAL [{LEFT|RIGHT} [OUTER]] JOIN table_factor\n\njoin_condition:\n ON conditional_expr\n | USING (column_list)\n\nindex_hint_list:\n index_hint [, index_hint] ...\n\nindex_hint:\n USE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n | IGNORE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n | FORCE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n\nindex_list:\n index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nIn MySQL 5.6.2 and later, a table reference (when it refers to a\npartitioned table) may contain a PARTITION option, including a\ncomma-separated list of partitions, subpartitions, or both. This option\nfollows the name of the table and precedes any alias declaration. The\neffect of this option is that rows are selected only from the listed\npartitions or subpartitions---in other words, any partitions or\nsubpartitions not named in the list are ignored For more information,\nsee http://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html.\n\nThe syntax of table_factor is extended in comparison with the SQL\nStandard. The latter accepts only table_reference, not a list of them\ninside a pair of parentheses.\n\nThis is a conservative extension if we consider each comma in a list of\ntable_reference items as equivalent to an inner join. For example:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins (see\nhttp://dev.mysql.com/doc/refman/5.6/en/nested-join-optimization.html).\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/index-hints.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/join.html\n\n','SELECT left_tbl.*\n FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n WHERE right_tbl.id IS NULL;\n','http://dev.mysql.com/doc/refman/5.6/en/join.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (0,28,'JOIN','MySQL supports the following JOIN syntaxes for the table_references\npart of SELECT statements and multiple-table DELETE and UPDATE\nstatements:\n\ntable_references:\n escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference:\n table_reference\n | { OJ table_reference }\n\ntable_reference:\n table_factor\n | join_table\n\ntable_factor:\n tbl_name [PARTITION (partition_names)]\n [[AS] alias] [index_hint_list]\n | table_subquery [AS] alias\n | ( table_references )\n\njoin_table:\n table_reference [INNER | CROSS] JOIN table_factor [join_condition]\n | table_reference STRAIGHT_JOIN table_factor\n | table_reference STRAIGHT_JOIN table_factor ON conditional_expr\n | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_condition\n | table_reference NATURAL [{LEFT|RIGHT} [OUTER]] JOIN table_factor\n\njoin_condition:\n ON conditional_expr\n | USING (column_list)\n\nindex_hint_list:\n index_hint [, index_hint] ...\n\nindex_hint:\n USE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n | IGNORE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n | FORCE {INDEX|KEY}\n [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n\nindex_list:\n index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nIn MySQL 5.6.2 and later, a table reference (when it refers to a\npartitioned table) may contain a PARTITION option, including a\ncomma-separated list of partitions, subpartitions, or both. This option\nfollows the name of the table and precedes any alias declaration. The\neffect of this option is that rows are selected only from the listed\npartitions or subpartitions---in other words, any partitions or\nsubpartitions not named in the list are ignored For more information,\nsee http://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html.\n\nThe syntax of table_factor is extended in comparison with the SQL\nStandard. The latter accepts only table_reference, not a list of them\ninside a pair of parentheses.\n\nThis is a conservative extension if we consider each comma in a list of\ntable_reference items as equivalent to an inner join. For example:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins (see\nhttp://dev.mysql.com/doc/refman/5.6/en/nested-join-optimization.html).\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/index-hints.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/join.html\n\n','SELECT left_tbl.*\n FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n WHERE right_tbl.id IS NULL;\n','http://dev.mysql.com/doc/refman/5.6/en/join.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (1,38,'HEX','Syntax:\nHEX(str), HEX(N)\n\nFor a string argument str, HEX() returns a hexadecimal string\nrepresentation of str where each byte of each character in str is\nconverted to two hexadecimal digits. (Multibyte characters therefore\nbecome more than two digits.) The inverse of this operation is\nperformed by the UNHEX() function.\n\nFor a numeric argument N, HEX() returns a hexadecimal string\nrepresentation of the value of N treated as a longlong (BIGINT) number.\nThis is equivalent to CONV(N,10,16). The inverse of this operation is\nperformed by CONV(HEX(N),16,10).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT X\'616263\', HEX(\'abc\'), UNHEX(HEX(\'abc\'));\n -> \'abc\', 616263, \'abc\'\nmysql> SELECT HEX(255), CONV(HEX(255),16,10);\n -> \'FF\', 255\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (2,31,'CONTAINS','Contains(g1,g2)\n\nMBRContains() and Contains() are synonyms. For more information, see\nthe description of MBRContains().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mbr.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (3,37,'SRID','SRID(g)\n\nST_SRID() and SRID() are synonyms. For more information, see the\ndescription of ST_SRID().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); @@ -95,7 +95,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (15,27,'SHOW CREATE PROCEDURE','Syntax:\nSHOW CREATE PROCEDURE proc_name\n\nThis statement is a MySQL extension. It returns the exact string that\ncan be used to re-create the named stored procedure. A similar\nstatement, SHOW CREATE FUNCTION, displays information about stored\nfunctions (see [HELP SHOW CREATE FUNCTION]).\n\nTo use either statement, you must be the user named in the routine\nDEFINER clause or have SELECT access to the mysql.proc table. If you do\nnot have privileges for the routine itself, the value displayed for the\nCreate Procedure or Create Function field will be NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-create-procedure.html\n\n','mysql> SHOW CREATE PROCEDURE test.simpleproc\\G\n*************************** 1. row ***************************\n Procedure: simpleproc\n sql_mode:\n Create Procedure: CREATE PROCEDURE `simpleproc`(OUT param1 INT)\n BEGIN\n SELECT COUNT(*) INTO param1 FROM t;\n END\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n Database Collation: latin1_swedish_ci\n\nmysql> SHOW CREATE FUNCTION test.hello\\G\n*************************** 1. row ***************************\n Function: hello\n sql_mode:\n Create Function: CREATE FUNCTION `hello`(s CHAR(20))\n RETURNS CHAR(50)\n RETURN CONCAT(\'Hello, \',s,\'!\')\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.6/en/show-create-procedure.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (16,24,'OPEN','Syntax:\nOPEN cursor_name\n\nThis statement opens a previously declared cursor. For an example, see\nhttp://dev.mysql.com/doc/refman/5.6/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/open.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/open.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (17,31,'ST_INTERSECTS','ST_Intersects(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially intersects g2.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-object-shapes.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-object-shapes.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (18,38,'LOWER','Syntax:\nLOWER(str)\n\nReturns the string str with all characters changed to lowercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT LOWER(\'QUADRATICALLY\');\n -> \'quadratically\'\n\nLOWER() (and UPPER()) are ineffective when applied to binary strings\n(BINARY, VARBINARY, BLOB). To perform lettercase conversion, convert\nthe string to a nonbinary string:\n\nmysql> SET @str = BINARY \'New York\';\nmysql> SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1));\n+-------------+-----------------------------------+\n| LOWER(@str) | LOWER(CONVERT(@str USING latin1)) |\n+-------------+-----------------------------------+\n| New York | new york |\n+-------------+-----------------------------------+\n\nFor Unicode character sets, LOWER() and UPPER() work accounting to\nUnicode Collation Algorithm (UCA) 5.2.0 for xxx_unicode_520_ci\ncollations and for language-specific collations that are derived from\nthem. For other Unicode collations, LOWER() and UPPER() work accounting\nto Unicode Collation Algorithm (UCA) 4.0.0. See\nhttp://dev.mysql.com/doc/refman/5.6/en/charset-unicode-sets.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (18,38,'LOWER','Syntax:\nLOWER(str)\n\nReturns the string str with all characters changed to lowercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT LOWER(\'QUADRATICALLY\');\n -> \'quadratically\'\n\nLOWER() (and UPPER()) are ineffective when applied to binary strings\n(BINARY, VARBINARY, BLOB). To perform lettercase conversion, convert\nthe string to a nonbinary string:\n\nmysql> SET @str = BINARY \'New York\';\nmysql> SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1));\n+-------------+-----------------------------------+\n| LOWER(@str) | LOWER(CONVERT(@str USING latin1)) |\n+-------------+-----------------------------------+\n| New York | new york |\n+-------------+-----------------------------------+\n\nFor collations of Unicode character sets, LOWER() and UPPER() work\naccording to the Unicode Collation Algorithm (UCA) version in the\ncollation name, if there is one, and UCA 4.0.0 if no version is\nspecified. For example, utf8_unicode_520_ci works according to UCA\n5.2.0, whereas utf8_unicode_ci works according to UCA 4.0.0. See\nhttp://dev.mysql.com/doc/refman/5.6/en/charset-unicode-sets.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (19,40,'CREATE TRIGGER','Syntax:\nCREATE\n [DEFINER = { user | CURRENT_USER }]\n TRIGGER trigger_name\n trigger_time trigger_event\n ON tbl_name FOR EACH ROW\n trigger_body\n\ntrigger_time: { BEFORE | AFTER }\n\ntrigger_event: { INSERT | UPDATE | DELETE }\n\nThis statement creates a new trigger. A trigger is a named database\nobject that is associated with a table, and that activates when a\nparticular event occurs for the table. The trigger becomes associated\nwith the table named tbl_name, which must refer to a permanent table.\nYou cannot associate a trigger with a TEMPORARY table or a view.\n\nTrigger names exist in the schema namespace, meaning that all triggers\nmust have unique names within a schema. Triggers in different schemas\ncan have the same name.\n\nThis section describes CREATE TRIGGER syntax. For additional\ndiscussion, see\nhttp://dev.mysql.com/doc/refman/5.6/en/trigger-syntax.html.\n\nCREATE TRIGGER requires the TRIGGER privilege for the table associated\nwith the trigger. The statement might also require the SUPER privilege,\ndepending on the DEFINER value, as described later in this section. If\nbinary logging is enabled, CREATE TRIGGER might require the SUPER\nprivilege, as described in\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-programs-logging.html.\n\nThe DEFINER clause determines the security context to be used when\nchecking access privileges at trigger activation time, as described\nlater in this section.\n\ntrigger_time is the trigger action time. It can be BEFORE or AFTER to\nindicate that the trigger activates before or after each row to be\nmodified.\n\ntrigger_event indicates the kind of operation that activates the\ntrigger. These trigger_event values are permitted:\n\no INSERT: The trigger activates whenever a new row is inserted into the\n table; for example, through INSERT, LOAD DATA, and REPLACE\n statements.\n\no UPDATE: The trigger activates whenever a row is modified; for\n example, through UPDATE statements.\n\no DELETE: The trigger activates whenever a row is deleted from the\n table; for example, through DELETE and REPLACE statements. DROP TABLE\n and TRUNCATE TABLE statements on the table do not activate this\n trigger, because they do not use DELETE. Dropping a partition does\n not activate DELETE triggers, either.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-trigger.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (20,32,'MONTH','Syntax:\nMONTH(date)\n\nReturns the month for date, in the range 1 to 12 for January to\nDecember, or 0 for dates such as \'0000-00-00\' or \'2008-00-00\' that have\na zero month part.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT MONTH(\'2008-02-03\');\n -> 2\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (21,7,'ASYMMETRIC_ENCRYPT','Syntax:\nASYMMETRIC_ENCRYPT(algorithm, str, key_str)\n\nEncrypts a string using the given algorithm and key string, and returns\nthe resulting ciphertext as a binary string. If encryption fails, the\nresult is NULL.\n\nThe str length cannot be greater than the key_str length − 11, in\nbytes\n\nkey_str must be a valid key string in PEM format. algorithm indicates\nthe encryption algorithm used to create the key.\n\nSupported algorithm values: \'RSA\'\n\nTo encrypt a string, pass a private or public key string to\nASYMMETRIC_ENCRYPT(). To recover the original unencrypted string, pass\nthe encrypted string to ASYMMETRIC_DECRYPT(), along with the public or\nprivate key string correponding to the private or public key string\nused for encryption.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/enterprise-encryption-functions.html\n\n','-- Generate private/public key pair\nSET @priv = CREATE_ASYMMETRIC_PRIV_KEY(\'RSA\', 1024);\nSET @pub = CREATE_ASYMMETRIC_PUB_KEY(\'RSA\', @priv);\n\n-- Encrypt using private key, decrypt using public key\nSET @ciphertext = ASYMMETRIC_ENCRYPT(\'RSA\', \'The quick brown fox\', @priv);\nSET @cleartext = ASYMMETRIC_DECRYPT(\'RSA\', @ciphertext, @pub);\n\n-- Encrypt using public key, decrypt using private key\nSET @ciphertext = ASYMMETRIC_ENCRYPT(\'RSA\', \'The quick brown fox\', @pub);\nSET @cleartext = ASYMMETRIC_DECRYPT(\'RSA\', @ciphertext, @priv);\n','http://dev.mysql.com/doc/refman/5.6/en/enterprise-encryption-functions.html'); @@ -147,11 +147,11 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (67,27,'CACHE INDEX','Syntax:\nCACHE INDEX\n tbl_index_list [, tbl_index_list] ...\n [PARTITION (partition_list | ALL)]\n IN key_cache_name\n\ntbl_index_list:\n tbl_name [[INDEX|KEY] (index_name[, index_name] ...)]\n\npartition_list:\n partition_name[, partition_name][, ...]\n\nThe CACHE INDEX statement assigns table indexes to a specific key\ncache. It is used only for MyISAM tables. After the indexes have been\nassigned, they can be preloaded into the cache if desired with LOAD\nINDEX INTO CACHE.\n\nThe following statement assigns indexes from the tables t1, t2, and t3\nto the key cache named hot_cache:\n\nmysql> CACHE INDEX t1, t2, t3 IN hot_cache;\n+---------+--------------------+----------+----------+\n| Table | Op | Msg_type | Msg_text |\n+---------+--------------------+----------+----------+\n| test.t1 | assign_to_keycache | status | OK |\n| test.t2 | assign_to_keycache | status | OK |\n| test.t3 | assign_to_keycache | status | OK |\n+---------+--------------------+----------+----------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/cache-index.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/cache-index.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (68,12,'COMPRESS','Syntax:\nCOMPRESS(string_to_compress)\n\nCompresses a string and returns the result as a binary string. This\nfunction requires MySQL to have been compiled with a compression\nlibrary such as zlib. Otherwise, the return value is always NULL. The\ncompressed string can be uncompressed with UNCOMPRESS().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html\n\n','mysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',1000)));\n -> 21\nmysql> SELECT LENGTH(COMPRESS(\'\'));\n -> 0\nmysql> SELECT LENGTH(COMPRESS(\'a\'));\n -> 13\nmysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',16)));\n -> 15\n','http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (69,28,'HANDLER','Syntax:\nHANDLER tbl_name OPEN [ [AS] alias]\n\nHANDLER tbl_name READ index_name { = | <= | >= | < | > } (value1,value2,...)\n [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ index_name { FIRST | NEXT | PREV | LAST }\n [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ { FIRST | NEXT }\n [ WHERE where_condition ] [LIMIT ... ]\n\nHANDLER tbl_name CLOSE\n\nThe HANDLER statement provides direct access to table storage engine\ninterfaces. It is available for InnoDB and MyISAM tables.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/handler.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/handler.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (70,9,'HELP_DATE','This help information was generated from the MySQL 5.6 Reference Manual\non: 2016-05-16\n','',''); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (70,9,'HELP_DATE','This help information was generated from the MySQL 5.6 Reference Manual\non: 2016-08-25\n','',''); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (71,40,'RENAME TABLE','Syntax:\nRENAME TABLE tbl_name TO new_tbl_name\n [, tbl_name2 TO new_tbl_name2] ...\n\nThis statement renames one or more tables. The rename operation is done\natomically, which means that no other session can access any of the\ntables while the rename is running.\n\nFor example, a table named old_table can be renamed to new_table as\nshown here:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/rename-table.html\n\n','RENAME TABLE old_table TO new_table;\n','http://dev.mysql.com/doc/refman/5.6/en/rename-table.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (72,23,'BOOLEAN','BOOL, BOOLEAN\n\nThese types are synonyms for TINYINT(1). A value of zero is considered\nfalse. Nonzero values are considered true:\n\nmysql> SELECT IF(0, \'true\', \'false\');\n+------------------------+\n| IF(0, \'true\', \'false\') |\n+------------------------+\n| false |\n+------------------------+\n\nmysql> SELECT IF(1, \'true\', \'false\');\n+------------------------+\n| IF(1, \'true\', \'false\') |\n+------------------------+\n| true |\n+------------------------+\n\nmysql> SELECT IF(2, \'true\', \'false\');\n+------------------------+\n| IF(2, \'true\', \'false\') |\n+------------------------+\n| true |\n+------------------------+\n\nHowever, the values TRUE and FALSE are merely aliases for 1 and 0,\nrespectively, as shown here:\n\nmysql> SELECT IF(0 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(0 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| true |\n+--------------------------------+\n\nmysql> SELECT IF(1 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(1 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| true |\n+-------------------------------+\n\nmysql> SELECT IF(2 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(2 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| false |\n+-------------------------------+\n\nmysql> SELECT IF(2 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(2 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| false |\n+--------------------------------+\n\nThe last two statements display the results shown because 2 is equal to\nneither 1 nor 0.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (73,3,'MOD','Syntax:\nMOD(N,M), N % M, N MOD M\n\nModulo operation. Returns the remainder of N divided by M.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT MOD(234, 10);\n -> 4\nmysql> SELECT 253 % 7;\n -> 1\nmysql> SELECT MOD(29,9);\n -> 2\nmysql> SELECT 29 MOD 9;\n -> 2\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (74,37,'ST_GEOMETRYTYPE','ST_GeometryType(g)\n\nReturns a binary string indicating the name of the geometry type of\nwhich the geometry instance g is a member. The name corresponds to one\nof the instantiable Geometry subclasses.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_GeometryType(ST_GeomFromText(\'POINT(1 1)\'));\n+------------------------------------------------+\n| ST_GeometryType(ST_GeomFromText(\'POINT(1 1)\')) |\n+------------------------------------------------+\n| POINT |\n+------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (74,37,'ST_GEOMETRYTYPE','ST_GeometryType(g)\n\nReturns a binary string indicating the name of the geometry type of\nwhich the geometry instance g is a member, or NULL if the argument is\nNULL. The name corresponds to one of the instantiable Geometry\nsubclasses.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_GeometryType(ST_GeomFromText(\'POINT(1 1)\'));\n+------------------------------------------------+\n| ST_GeometryType(ST_GeomFromText(\'POINT(1 1)\')) |\n+------------------------------------------------+\n| POINT |\n+------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (75,29,'HELP STATEMENT','Syntax:\nHELP \'search_string\'\n\nThe HELP statement returns online information from the MySQL Reference\nmanual. Its proper operation requires that the help tables in the mysql\ndatabase be initialized with help topic information (see\nhttp://dev.mysql.com/doc/refman/5.6/en/server-side-help-support.html).\n\nThe HELP statement searches the help tables for the given search string\nand displays the result of the search. The search string is not case\nsensitive.\n\nThe search string can contain the wildcard characters "%" and "_".\nThese have the same meaning as for pattern-matching operations\nperformed with the LIKE operator. For example, HELP \'rep%\' returns a\nlist of topics that begin with rep.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/help.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/help.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (76,38,'UCASE','Syntax:\nUCASE(str)\n\nUCASE() is a synonym for UPPER().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (77,27,'SHOW BINLOG EVENTS','Syntax:\nSHOW BINLOG EVENTS\n [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the binary log. If you do not specify \'log_name\',\nthe first binary log is displayed.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-binlog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-binlog-events.html'); @@ -190,14 +190,14 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (110,8,'SET GLOBAL SQL_SLAVE_SKIP_COUNTER','Syntax:\nSET GLOBAL sql_slave_skip_counter = N\n\nThis statement skips the next N events from the master. This is useful\nfor recovering from replication stops caused by a statement.\n\nThis statement is valid only when the slave threads are not running.\nOtherwise, it produces an error.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/set-global-sql-slave-skip-counter.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/set-global-sql-slave-skip-counter.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (111,7,'MBREQUAL','MBREqual(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 are the same.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (112,34,'PROCEDURE ANALYSE','Syntax:\nANALYSE([max_elements[,max_memory]])\n\nANALYSE() examines the result from a query and returns an analysis of\nthe results that suggests optimal data types for each column that may\nhelp reduce table sizes. To obtain this analysis, append PROCEDURE\nANALYSE to the end of a SELECT statement:\n\nSELECT ... FROM ... WHERE ... PROCEDURE ANALYSE([max_elements,[max_memory]])\n\nFor example:\n\nSELECT col1, col2 FROM table1 PROCEDURE ANALYSE(10, 2000);\n\nThe results show some statistics for the values returned by the query,\nand propose an optimal data type for the columns. This can be helpful\nfor checking your existing tables, or after importing new data. You may\nneed to try different settings for the arguments so that PROCEDURE\nANALYSE() does not suggest the ENUM data type when it is not\nappropriate.\n\nThe arguments are optional and are used as follows:\n\no max_elements (default 256) is the maximum number of distinct values\n that ANALYSE() notices per column. This is used by ANALYSE() to check\n whether the optimal data type should be of type ENUM; if there are\n more than max_elements distinct values, then ENUM is not a suggested\n type.\n\no max_memory (default 8192) is the maximum amount of memory that\n ANALYSE() should allocate per column while trying to find all\n distinct values.\n\nA PROCEDURE clause is not permitted in a UNION statement.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/procedure-analyse.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/procedure-analyse.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (113,9,'HELP_VERSION','This help information was generated from the MySQL 5.6 Reference Manual\non: 2016-05-16 (revision: 47742)\n\nThis information applies to MySQL 5.6 through 5.6.32.\n','',''); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (113,9,'HELP_VERSION','This help information was generated from the MySQL 5.6 Reference Manual\non: 2016-08-25 (revision: 48695)\n\nThis information applies to MySQL 5.6 through 5.6.34.\n','',''); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (114,38,'CHARACTER_LENGTH','Syntax:\nCHARACTER_LENGTH(str)\n\nCHARACTER_LENGTH() is a synonym for CHAR_LENGTH().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (115,27,'SHOW PRIVILEGES','Syntax:\nSHOW PRIVILEGES\n\nSHOW PRIVILEGES shows the list of system privileges that the MySQL\nserver supports. The exact list of privileges depends on the version of\nyour server.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-privileges.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-privileges.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (116,40,'CREATE TABLESPACE','Syntax:\nCREATE TABLESPACE tablespace_name\n ADD DATAFILE \'file_name\'\n USE LOGFILE GROUP logfile_group\n [EXTENT_SIZE [=] extent_size]\n [INITIAL_SIZE [=] initial_size]\n [AUTOEXTEND_SIZE [=] autoextend_size]\n [MAX_SIZE [=] max_size]\n [NODEGROUP [=] nodegroup_id]\n [WAIT]\n [COMMENT [=] comment_text]\n ENGINE [=] engine_name\n\nThis statement is used to create a tablespace, which can contain one or\nmore data files, providing storage space for tables. One data file is\ncreated and added to the tablespace using this statement. Additional\ndata files may be added to the tablespace by using the ALTER TABLESPACE\nstatement (see [HELP ALTER TABLESPACE]). For rules covering the naming\nof tablespaces, see\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nA log file group of one or more UNDO log files must be assigned to the\ntablespace to be created with the USE LOGFILE GROUP clause.\nlogfile_group must be an existing log file group created with CREATE\nLOGFILE GROUP (see [HELP CREATE LOGFILE GROUP]). Multiple tablespaces\nmay use the same log file group for UNDO logging.\n\nThe EXTENT_SIZE sets the size, in bytes, of the extents used by any\nfiles belonging to the tablespace. The default value is 1M. The minimum\nsize is 32K, and theoretical maximum is 2G, although the practical\nmaximum size depends on a number of factors. In most cases, changing\nthe extent size does not have any measurable effect on performance, and\nthe default value is recommended for all but the most unusual\nsituations.\n\nAn extent is a unit of disk space allocation. One extent is filled with\nas much data as that extent can contain before another extent is used.\nIn theory, up to 65,535 (64K) extents may used per data file; however,\nthe recommended maximum is 32,768 (32K). The recommended maximum size\nfor a single data file is 32G---that is, 32K extents x 1 MB per extent.\nIn addition, once an extent is allocated to a given partition, it\ncannot be used to store data from a different partition; an extent\ncannot store data from more than one partition. This means, for example\nthat a tablespace having a single datafile whose INITIAL_SIZE is 256 MB\nand whose EXTENT_SIZE is 128M has just two extents, and so can be used\nto store data from at most two different disk data table partitions.\n\nYou can see how many extents remain free in a given data file by\nquerying the INFORMATION_SCHEMA.FILES table, and so derive an estimate\nfor how much space remains free in the file. For further discussion and\nexamples, see http://dev.mysql.com/doc/refman/5.6/en/files-table.html.\n\nThe INITIAL_SIZE parameter sets the data file\'s total size in bytes.\nOnce the file has been created, its size cannot be changed; however,\nyou can add more data files to the tablespace using ALTER TABLESPACE\n... ADD DATAFILE. See [HELP ALTER TABLESPACE].\n\nINITIAL_SIZE is optional; its default value is 134217728 (128 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nWhen setting EXTENT_SIZE, you may optionally follow the number with a\none-letter abbreviation for an order of magnitude, similar to those\nused in my.cnf. Generally, this is one of the letters M (for megabytes)\nor G (for gigabytes). In MySQL Cluster NDB 7.3.2 and later, these\nabbreviations are also supported when specifying INITIAL_SIZE as well.\n(Bug #13116514, Bug #16104705, Bug #62858)\n\nINITIAL_SIZE, EXTENT_SIZE, and UNDO_BUFFER_SIZE are subject to rounding\nas follows:\n\no EXTENT_SIZE and UNDO_BUFFER_SIZE are each rounded up to the nearest\n whole multiple of 32K.\n\no INITIAL_SIZE is rounded down to the nearest whole multiple of 32K.\n\n For data files, INITIAL_SIZE is subject to further rounding; the\n result just obtained is rounded up to the nearest whole multiple of\n EXTENT_SIZE (after any rounding).\n\nThe rounding just described is done explicitly, and a warning is issued\nby the MySQL Server when any such rounding is performed. The rounded\nvalues are also used by the NDB kernel for calculating\nINFORMATION_SCHEMA.FILES column values and other purposes. However, to\navoid an unexpected result, we suggest that you always use whole\nmultiples of 32K in specifying these options.\n\nAUTOEXTEND_SIZE, MAX_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but\nignored, and so currently have no effect. These options are intended\nfor future expansion.\n\nThe ENGINE parameter determines the storage engine which uses this\ntablespace, with engine_name being the name of the storage engine.\nCurrently, engine_name must be one of the values NDB or NDBCLUSTER.\n\nWhen CREATE TABLESPACE is used with ENGINE = NDB, a tablespace and\nassociated data file are created on each Cluster data node. You can\nverify that the data files were created and obtain information about\nthem by querying the INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, FILE_NAME, EXTRA\n -> FROM INFORMATION_SCHEMA.FILES\n -> WHERE TABLESPACE_NAME = \'newts\' AND FILE_TYPE = \'DATAFILE\';\n+--------------------+-------------+----------------+\n| LOGFILE_GROUP_NAME | FILE_NAME | EXTRA |\n+--------------------+-------------+----------------+\n| lg_3 | newdata.dat | CLUSTER_NODE=3 |\n| lg_3 | newdata.dat | CLUSTER_NODE=4 |\n+--------------------+-------------+----------------+\n2 rows in set (0.01 sec)\n\n(See http://dev.mysql.com/doc/refman/5.6/en/files-table.html.)\n\nCREATE TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.6/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-tablespace.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (117,4,'ST_GEOMFROMTEXT','ST_GeomFromText(wkt[,srid]), ST_GeometryFromText(wkt[,srid])\n\nConstructs a geometry value of any type using its WKT representation\nand SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (118,38,'INSERT FUNCTION','Syntax:\nINSERT(str,pos,len,newstr)\n\nReturns the string str, with the substring beginning at position pos\nand len characters long replaced by the string newstr. Returns the\noriginal string if pos is not within the length of the string. Replaces\nthe rest of the string from position pos if len is not within the\nlength of the rest of the string. Returns NULL if any argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT INSERT(\'Quadratic\', 3, 4, \'What\');\n -> \'QuWhattic\'\nmysql> SELECT INSERT(\'Quadratic\', -1, 4, \'What\');\n -> \'Quadratic\'\nmysql> SELECT INSERT(\'Quadratic\', 3, 100, \'What\');\n -> \'QuWhat\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (119,15,'XOR','Syntax:\nXOR\n\nLogical XOR. Returns NULL if either operand is NULL. For non-NULL\noperands, evaluates to 1 if an odd number of operands is nonzero,\notherwise 0 is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/logical-operators.html\n\n','mysql> SELECT 1 XOR 1;\n -> 0\nmysql> SELECT 1 XOR 0;\n -> 1\nmysql> SELECT 1 XOR NULL;\n -> NULL\nmysql> SELECT 1 XOR 1 XOR 1;\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/logical-operators.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (120,10,'GRANT','Syntax:\nGRANT\n priv_type [(column_list)]\n [, priv_type [(column_list)]] ...\n ON [object_type] priv_level\n TO user_specification [, user_specification] ...\n [REQUIRE {NONE | tsl_option [[AND] tsl_option] ...}]\n [WITH {GRANT OPTION | resource_option} ...]\n\nGRANT PROXY ON user_specification\n TO user_specification [, user_specification] ...\n [WITH GRANT OPTION]\n\nobject_type: {\n TABLE\n | FUNCTION\n | PROCEDURE\n}\n\npriv_level: {\n *\n | *.*\n | db_name.*\n | db_name.tbl_name\n | tbl_name\n | db_name.routine_name\n}\n\nuser_specification:\n user [ auth_option ]\n\nauth_option: {\n IDENTIFIED BY \'auth_string\'\n | IDENTIFIED BY PASSWORD \'hash_string\'\n | IDENTIFIED WITH auth_plugin\n | IDENTIFIED WITH auth_plugin AS \'hash_string\'\n}\n\ntsl_option: {\n SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n | MAX_QUERIES_PER_HOUR count\n | MAX_UPDATES_PER_HOUR count\n | MAX_CONNECTIONS_PER_HOUR count\n | MAX_USER_CONNECTIONS count\n}\n\nThe GRANT statement grants privileges to MySQL user accounts. GRANT\nalso serves to specify other account characteristics such as use of\nsecure connections and limits on access to server resources.\n\nTo use GRANT, you must have the GRANT OPTION privilege, and you must\nhave the privileges that you are granting. When the read_only system\nvariable is enabled, GRANT additionally requires the SUPER privilege.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nNormally, a database administrator first uses CREATE USER to create an\naccount, then GRANT to define its privileges and characteristics. For\nexample:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nGRANT USAGE ON *.* TO \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\n*Note*: Examples shown here include no IDENTIFIED clause. It is assumed\nthat you establish passwords with CREATE USER at account-creation time\nto avoid creating insecure accounts.\n\nIf an account named in a GRANT statement does not already exist, GRANT\nmay create it under the conditions described later in the discussion of\nthe NO_AUTO_CREATE_USER SQL mode.\n\nFrom the mysql program, GRANT responds with Query OK, 0 rows affected\nwhen executed successfully. To determine what privileges result from\nthe operation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/grant.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/grant.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (120,10,'GRANT','Syntax:\nGRANT\n priv_type [(column_list)]\n [, priv_type [(column_list)]] ...\n ON [object_type] priv_level\n TO user_specification [, user_specification] ...\n [REQUIRE {NONE | tls_option [[AND] tls_option] ...}]\n [WITH {GRANT OPTION | resource_option} ...]\n\nGRANT PROXY ON user_specification\n TO user_specification [, user_specification] ...\n [WITH GRANT OPTION]\n\nobject_type: {\n TABLE\n | FUNCTION\n | PROCEDURE\n}\n\npriv_level: {\n *\n | *.*\n | db_name.*\n | db_name.tbl_name\n | tbl_name\n | db_name.routine_name\n}\n\nuser_specification:\n user [ auth_option ]\n\nauth_option: {\n IDENTIFIED BY \'auth_string\'\n | IDENTIFIED BY PASSWORD \'hash_string\'\n | IDENTIFIED WITH auth_plugin\n | IDENTIFIED WITH auth_plugin AS \'hash_string\'\n}\n\ntls_option: {\n SSL\n | X509\n | CIPHER \'cipher\'\n | ISSUER \'issuer\'\n | SUBJECT \'subject\'\n}\n\nresource_option: {\n | MAX_QUERIES_PER_HOUR count\n | MAX_UPDATES_PER_HOUR count\n | MAX_CONNECTIONS_PER_HOUR count\n | MAX_USER_CONNECTIONS count\n}\n\nThe GRANT statement grants privileges to MySQL user accounts. GRANT\nalso serves to specify other account characteristics such as use of\nsecure connections and limits on access to server resources.\n\nTo use GRANT, you must have the GRANT OPTION privilege, and you must\nhave the privileges that you are granting. When the read_only system\nvariable is enabled, GRANT additionally requires the SUPER privilege.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nNormally, a database administrator first uses CREATE USER to create an\naccount, then GRANT to define its privileges and characteristics. For\nexample:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nGRANT USAGE ON *.* TO \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\n*Note*: Examples shown here include no IDENTIFIED clause. It is assumed\nthat you establish passwords with CREATE USER at account-creation time\nto avoid creating insecure accounts.\n\nIf an account named in a GRANT statement does not already exist, GRANT\nmay create it under the conditions described later in the discussion of\nthe NO_AUTO_CREATE_USER SQL mode.\n\nFrom the mysql program, GRANT responds with Query OK, 0 rows affected\nwhen executed successfully. To determine what privileges result from\nthe operation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/grant.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/grant.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (121,7,'MBRINTERSECTS','MBRIntersects(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 intersect.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (122,20,'IS NOT','Syntax:\nIS NOT boolean_value\n\nTests a value against a boolean value, where boolean_value can be TRUE,\nFALSE, or UNKNOWN.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NOT UNKNOWN, 0 IS NOT UNKNOWN, NULL IS NOT UNKNOWN;\n -> 1, 1, 0\n','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (123,3,'SQRT','Syntax:\nSQRT(X)\n\nReturns the square root of a nonnegative number X.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT SQRT(4);\n -> 2\nmysql> SELECT SQRT(20);\n -> 4.4721359549996\nmysql> SELECT SQRT(-16);\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); @@ -218,7 +218,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (138,23,'DOUBLE PRECISION','DOUBLE PRECISION[(M,D)] [UNSIGNED] [ZEROFILL], REAL[(M,D)] [UNSIGNED]\n[ZEROFILL]\n\nThese types are synonyms for DOUBLE. Exception: If the REAL_AS_FLOAT\nSQL mode is enabled, REAL is a synonym for FLOAT rather than DOUBLE.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (139,38,'ORD','Syntax:\nORD(str)\n\nIf the leftmost character of the string str is a multibyte character,\nreturns the code for that character, calculated from the numeric values\nof its constituent bytes using this formula:\n\n (1st byte code)\n+ (2nd byte code * 256)\n+ (3rd byte code * 2562) ...\n\nIf the leftmost character is not a multibyte character, ORD() returns\nthe same value as the ASCII() function.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT ORD(\'2\');\n -> 50\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (140,37,'ENVELOPE','Envelope(g)\n\nST_Envelope() and Envelope() are synonyms. For more information, see\nthe description of ST_Envelope().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (141,37,'ST_ISEMPTY','ST_IsEmpty(g)\n\nThis function is a placeholder that returns 0 for any valid geometry\nvalue, 1 for any invalid geometry value or NULL.\n\nMySQL does not support GIS EMPTY values such as POINT EMPTY.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (141,37,'ST_ISEMPTY','ST_IsEmpty(g)\n\nThis function is a placeholder that returns 0 for any valid geometry\nvalue, 1 for any invalid geometry value, or NULL if the argument is\nNULL.\n\nMySQL does not support GIS EMPTY values such as POINT EMPTY.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (142,14,'INET_ATON','Syntax:\nINET_ATON(expr)\n\nGiven the dotted-quad representation of an IPv4 network address as a\nstring, returns an integer that represents the numeric value of the\naddress in network byte order (big endian). INET_ATON() returns NULL if\nit does not understand its argument.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_ATON(\'10.0.5.9\');\n -> 167773449\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (143,37,'ISSIMPLE','IsSimple(g)\n\nST_IsSimple() and IsSimple() are synonyms. For more information, see\nthe description of ST_IsSimple().\n\nPrior to MySQL 5.6.1, IsSimple() always returns 0.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (144,3,'- BINARY','Syntax:\n-\n\nSubtraction:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/arithmetic-functions.html\n\n','mysql> SELECT 3-5;\n -> -2\n','http://dev.mysql.com/doc/refman/5.6/en/arithmetic-functions.html'); @@ -249,11 +249,11 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (169,38,'INSTR','Syntax:\nINSTR(str,substr)\n\nReturns the position of the first occurrence of substring substr in\nstring str. This is the same as the two-argument form of LOCATE(),\nexcept that the order of the arguments is reversed.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT INSTR(\'foobarbar\', \'bar\');\n -> 4\nmysql> SELECT INSTR(\'xbar\', \'foobar\');\n -> 0\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (170,20,'>=','Syntax:\n>=\n\nGreater than or equal:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','mysql> SELECT 2 >= 2;\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (171,3,'EXP','Syntax:\nEXP(X)\n\nReturns the value of e (the base of natural logarithms) raised to the\npower of X. The inverse of this function is LOG() (using a single\nargument only) or LN().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT EXP(2);\n -> 7.3890560989307\nmysql> SELECT EXP(-2);\n -> 0.13533528323661\nmysql> SELECT EXP(0);\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (172,37,'ST_ISSIMPLE','ST_IsSimple(g)\n\nReturns 1 if the geometry value g has no anomalous geometric points,\nsuch as self-intersection or self-tangency. ST_IsSimple() returns 0 if\nthe argument is not simple, and NULL if it is NULL.\n\nThe description of each instantiable geometric class given earlier in\nthe chapter includes the specific conditions that cause an instance of\nthat class to be classified as not simple. (See [HELP Geometry\nhierarchy].)\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (172,37,'ST_ISSIMPLE','ST_IsSimple(g)\n\nReturns 1 if the geometry value g has no anomalous geometric points,\nsuch as self-intersection or self-tangency. ST_IsSimple() returns 0 if\nthe argument is not simple, and NULL if the argument is NULL.\n\nThe description of each instantiable geometric class given earlier in\nthe chapter includes the specific conditions that cause an instance of\nthat class to be classified as not simple. (See [HELP Geometry\nhierarchy].)\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (173,13,'POINTN','PointN(ls,N)\n\nST_PointN() and PointN() are synonyms. For more information, see the\ndescription of ST_PointN().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (174,38,'OCT','Syntax:\nOCT(N)\n\nReturns a string representation of the octal value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,8). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT OCT(12);\n -> \'14\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (175,32,'SYSDATE','Syntax:\nSYSDATE([fsp])\n\nReturns the current date and time as a value in \'YYYY-MM-DD HH:MM:SS\'\nor YYYYMMDDHHMMSS format, depending on whether the function is used in\na string or numeric context.\n\nAs of MySQL 5.6.4, if the fsp argument is given to specify a fractional\nseconds precision from 0 to 6, the return value includes a fractional\nseconds part of that many digits. Before 5.6.4, any argument is\nignored.\n\nSYSDATE() returns the time at which it executes. This differs from the\nbehavior for NOW(), which returns a constant time that indicates the\ntime at which the statement began to execute. (Within a stored function\nor trigger, NOW() returns the time at which the function or triggering\nstatement began to execute.)\n\nmysql> SELECT NOW(), SLEEP(2), NOW();\n+---------------------+----------+---------------------+\n| NOW() | SLEEP(2) | NOW() |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:36 | 0 | 2006-04-12 13:47:36 |\n+---------------------+----------+---------------------+\n\nmysql> SELECT SYSDATE(), SLEEP(2), SYSDATE();\n+---------------------+----------+---------------------+\n| SYSDATE() | SLEEP(2) | SYSDATE() |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:44 | 0 | 2006-04-12 13:47:46 |\n+---------------------+----------+---------------------+\n\nIn addition, the SET TIMESTAMP statement affects the value returned by\nNOW() but not by SYSDATE(). This means that timestamp settings in the\nbinary log have no effect on invocations of SYSDATE().\n\nBecause SYSDATE() can return different values even within the same\nstatement, and is not affected by SET TIMESTAMP, it is nondeterministic\nand therefore unsafe for replication if statement-based binary logging\nis used. If that is a problem, you can use row-based logging.\n\nAlternatively, you can use the --sysdate-is-now option to cause\nSYSDATE() to be an alias for NOW(). This works if the option is used on\nboth the master and the slave.\n\nThe nondeterministic nature of SYSDATE() also means that indexes cannot\nbe used for evaluating expressions that refer to it.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (176,5,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. It requires the\nDELETE privilege for the mysql.plugin table.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\ntable, so that subsequent server restarts will not load and initialize\nthe plugin. UNINSTALL PLUGIN does not remove the plugin\'s shared\nlibrary file.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/uninstall-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/uninstall-plugin.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (176,5,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. It requires the\nDELETE privilege for the mysql.plugin system table. UNINSTALL PLUGIN is\nthe complement of INSTALL PLUGIN.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\ntable, so that subsequent server restarts will not load and initialize\nthe plugin. UNINSTALL PLUGIN does not remove the plugin\'s shared\nlibrary file.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/uninstall-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/uninstall-plugin.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (177,33,'ASBINARY','AsBinary(g), AsWKB(g)\n\nST_AsBinary(), ST_AsWKB(), AsBinary(), and AsWKB() are synonyms. For\nmore information, see the description of ST_AsBinary().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-format-conversion-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-format-conversion-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (178,27,'SHOW TABLES','Syntax:\nSHOW [FULL] TABLES [{FROM | IN} db_name]\n [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLES lists the non-TEMPORARY tables in a given database. You can\nalso get this list using the mysqlshow db_name command. The LIKE\nclause, if present, indicates which table names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in http://dev.mysql.com/doc/refman/5.6/en/extended-show.html.\n\nMatching performed by the LIKE clause is dependent on the setting of\nthe lower_case_table_names system variable.\n\nThis statement also lists any views in the database. The FULL modifier\nis supported such that SHOW FULL TABLES displays a second output\ncolumn. Values for the second column are BASE TABLE for a table and\nVIEW for a view.\n\nIf you have no privileges for a base table or view, it does not show up\nin the output from SHOW TABLES or mysqlshow db_name.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-tables.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (179,32,'MAKEDATE','Syntax:\nMAKEDATE(year,dayofyear)\n\nReturns a date, given year and day-of-year values. dayofyear must be\ngreater than 0 or the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT MAKEDATE(2011,31), MAKEDATE(2011,32);\n -> \'2011-01-31\', \'2011-02-01\'\nmysql> SELECT MAKEDATE(2011,365), MAKEDATE(2014,365);\n -> \'2011-12-31\', \'2014-12-31\'\nmysql> SELECT MAKEDATE(2011,0);\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); @@ -261,10 +261,10 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (181,7,'MBROVERLAPS','MBROverlaps(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 overlap. The term spatially overlaps is\nused if two geometries intersect and their intersection results in a\ngeometry of the same dimension but not equal to either of the given\ngeometries.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (182,33,'ST_LINEFROMWKB','ST_LineFromWKB(wkb[,srid]), ST_LineStringFromWKB(wkb[,srid])\n\nConstructs a LineString value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (183,7,'ASYMMETRIC_DERIVE','Syntax:\nASYMMETRIC_DERIVE(pub_key_str, priv_key_str)\n\nDerives a symmetric key using the private key of one party and the\npublic key of another, and returns the resulting key as a binary\nstring. If key derivation fails, the result is NULL.\n\npub_key_str and priv_key_str must be valid key strings in PEM format.\nThey must be created using the DH algorithm.\n\nSuppose that you have two pairs of public and private keys:\n\nSET @dhp = CREATE_DH_PARAMETERS(1024);\nSET @priv1 = CREATE_ASYMMETRIC_PRIV_KEY(\'DH\', @dhp);\nSET @pub1 = CREATE_ASYMMETRIC_PUB_KEY(\'DH\', @priv1);\nSET @priv2 = CREATE_ASYMMETRIC_PRIV_KEY(\'DH\', @dhp);\nSET @pub2 = CREATE_ASYMMETRIC_PUB_KEY(\'DH\', @priv2);\n\nSuppose further that you use the private key from one pair and the\npublic key from the other pair to create a symmetric key string. Then\nthis symmetric key identity relationship holds:\n\nASYMMETRIC_DERIVE(@pub1, @priv2) = ASYMMETRIC_DERIVE(@pub2, @priv1)\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/enterprise-encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/enterprise-encryption-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (184,28,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name \n [PARTITION (partition_name,...)]\n [(col_name,...)]\n SELECT ...\n [ ON DUPLICATE KEY UPDATE col_name=expr, ... ]\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom one or many tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n SELECT tbl_temp1.fld_order_id\n FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/insert-select.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/insert-select.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (184,28,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n [(col_name,...)]\n SELECT ...\n [ ON DUPLICATE KEY UPDATE col_name=expr, ... ]\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom one or many tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n SELECT tbl_temp1.fld_order_id\n FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/insert-select.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/insert-select.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (185,40,'CREATE PROCEDURE','Syntax:\nCREATE\n [DEFINER = { user | CURRENT_USER }]\n PROCEDURE sp_name ([proc_parameter[,...]])\n [characteristic ...] routine_body\n\nCREATE\n [DEFINER = { user | CURRENT_USER }]\n FUNCTION sp_name ([func_parameter[,...]])\n RETURNS type\n [characteristic ...] routine_body\n\nproc_parameter:\n [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n param_name type\n\ntype:\n Any valid MySQL data type\n\ncharacteristic:\n COMMENT \'string\'\n | LANGUAGE SQL\n | [NOT] DETERMINISTIC\n | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n | SQL SECURITY { DEFINER | INVOKER }\n\nroutine_body:\n Valid SQL routine statement\n\nThese statements create stored routines. By default, a routine is\nassociated with the default database. To associate the routine\nexplicitly with a given database, specify the name as db_name.sp_name\nwhen you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support UDFs\n(user-defined functions). See\nhttp://dev.mysql.com/doc/refman/5.6/en/adding-functions.html. A UDF can\nbe regarded as an external stored function. Stored functions share\ntheir namespace with UDFs. See\nhttp://dev.mysql.com/doc/refman/5.6/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. They might also require the SUPER privilege, depending on\nthe DEFINER value, as described later in this section. If binary\nlogging is enabled, CREATE FUNCTION might require the SUPER privilege,\nas described in\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-routines-privileges.html.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*: Specifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an IN or INOUT\nparameter.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-program-restrictions.html\n.\n\nThe following example shows a simple stored procedure that uses an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE simpleproc (OUT param1 INT)\n -> BEGIN\n -> SELECT COUNT(*) INTO param1 FROM t;\n -> END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter ;\n\nmysql> CALL simpleproc(@a);\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @a;\n+------+\n| @a |\n+------+\n| 3 |\n+------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n -> RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world! |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type. The COLLATE attribute can be used if preceded by the\nCHARACTER SET attribute.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttp://dev.mysql.com/doc/refman/5.6/en/sql-syntax-compound-statements.h\ntml.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET). For statements that can be determined only at\nruntime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-program-restrictions.html\n.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-procedure.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (186,7,'SQL_THREAD_WAIT_AFTER_GTIDS','Syntax:\nSQL_THREAD_WAIT_AFTER_GTIDS(gtid_set[, timeout])\n\nSQL_THREAD_WAIT_AFTER_GTIDS() was added in MySQL 5.6.5, and replaced by\nWAIT_UNTIL_SQL_THREAD_AFTER_GTIDS() in MySQL 5.6.9. (Bug #14775984)\n\nFor more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/replication-gtids.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (187,24,'GET DIAGNOSTICS','Syntax:\nGET [CURRENT] DIAGNOSTICS\n{\n statement_information_item\n [, statement_information_item] ... \n | CONDITION condition_number\n condition_information_item\n [, condition_information_item] ...\n}\n\nstatement_information_item:\n target = statement_information_item_name\n\ncondition_information_item:\n target = condition_information_item_name\n\nstatement_information_item_name:\n NUMBER\n | ROW_COUNT\n\ncondition_information_item_name:\n CLASS_ORIGIN\n | SUBCLASS_ORIGIN\n | RETURNED_SQLSTATE\n | MESSAGE_TEXT\n | MYSQL_ERRNO\n | CONSTRAINT_CATALOG\n | CONSTRAINT_SCHEMA\n | CONSTRAINT_NAME\n | CATALOG_NAME\n | SCHEMA_NAME\n | TABLE_NAME\n | COLUMN_NAME\n | CURSOR_NAME\n\ncondition_number, target:\n (see following discussion)\n\nSQL statements produce diagnostic information that populates the\ndiagnostics area. The GET DIAGNOSTICS statement enables applications to\ninspect this information. It is available as of MySQL 5.6.4. (You can\nalso use SHOW WARNINGS or SHOW ERRORS to see conditions or errors.)\n\nNo special privileges are required to execute GET DIAGNOSTICS.\n\nThe keyword CURRENT means to retrieve information from the current\ndiagnostics area. In MySQL, it has no effect because that is the\ndefault behavior.\n\nGET DIAGNOSTICS is typically used in a handler within a stored program,\nbut it is a MySQL extension that it is permitted outside handler\ncontext to check the execution of any SQL statement. For example, if\nyou invoke the mysql client program, you can enter these statements at\nthe prompt:\n\nmysql> DROP TABLE test.no_such_table;\nERROR 1051 (42S02): Unknown table \'test.no_such_table\'\nmysql> GET DIAGNOSTICS CONDITION 1\n -> @p1 = RETURNED_SQLSTATE, @p2 = MESSAGE_TEXT;\nmysql> SELECT @p1, @p2;\n+-------+------------------------------------+\n| @p1 | @p2 |\n+-------+------------------------------------+\n| 42S02 | Unknown table \'test.no_such_table\' |\n+-------+------------------------------------+\n\nFor a description of the diagnostics area, see\nhttp://dev.mysql.com/doc/refman/5.6/en/diagnostics-area.html. Briefly,\nit contains two kinds of information:\n\no Statement information, such as the number of conditions that occurred\n or the affected-rows count.\n\no Condition information, such as the error code and message. If a\n statement raises multiple conditions, this part of the diagnostics\n area has a condition area for each one. If a statement raises no\n conditions, this part of the diagnostics area is empty.\n\nFor a statement that produces three conditions, the diagnostics area\ncontains statement and condition information like this:\n\nStatement information:\n row count\n ... other statement information items ...\nCondition area list:\n Condition area 1:\n error code for condition 1\n error message for condition 1\n ... other condition information items ...\n Condition area 2:\n error code for condition 2:\n error message for condition 2\n ... other condition information items ...\n Condition area 3:\n error code for condition 3\n error message for condition 3\n ... other condition information items ...\n\nGET DIAGNOSTICS can obtain either statement or condition information,\nbut not both in the same statement:\n\no To obtain statement information, retrieve the desired statement items\n into target variables. This instance of GET DIAGNOSTICS assigns the\n number of available conditions and the rows-affected count to the\n user variables @p1 and @p2:\n\nGET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;\n\no To obtain condition information, specify the condition number and\n retrieve the desired condition items into target variables. This\n instance of GET DIAGNOSTICS assigns the SQLSTATE value and error\n message to the user variables @p3 and @p4:\n\nGET DIAGNOSTICS CONDITION 1\n @p3 = RETURNED_SQLSTATE, @p4 = MESSAGE_TEXT;\n\nThe retrieval list specifies one or more target = item_name\nassignments, separated by commas. Each assignment names a target\nvariable and either a statement_information_item_name or\ncondition_information_item_name designator, depending on whether the\nstatement retrieves statement or condition information.\n\nValid target designators for storing item information can be stored\nprocedure or function parameters, stored program local variables\ndeclared with DECLARE, or user-defined variables.\n\nValid condition_number designators can be stored procedure or function\nparameters, stored program local variables declared with DECLARE,\nuser-defined variables, system variables, or literals. A character\nliteral may include a _charset introducer. A warning occurs if the\ncondition number is not in the range from 1 to the number of condition\nareas that have information. In this case, the warning is added to the\ndiagnostics area without clearing it.\n\nWhen a condition occurs, MySQL does not populate all condition items\nrecognized by GET DIAGNOSTICS. For example:\n\nmysql> GET DIAGNOSTICS CONDITION 1\n -> @p5 = SCHEMA_NAME, @p6 = TABLE_NAME;\nmysql> SELECT @p5, @p6;\n+------+------+\n| @p5 | @p6 |\n+------+------+\n| | |\n+------+------+\n\nIn standard SQL, if there are multiple conditions, the first condition\nrelates to the SQLSTATE value returned for the previous SQL statement.\nIn MySQL, this is not guaranteed. To get the main error, you cannot do\nthis:\n\nGET DIAGNOSTICS CONDITION 1 @errno = MYSQL_ERRNO;\n\nInstead, retrieve the condition count first, then use it to specify\nwhich condition number to inspect:\n\nGET DIAGNOSTICS @cno = NUMBER;\nGET DIAGNOSTICS CONDITION @cno @errno = MYSQL_ERRNO;\n\nFor information about permissible statement and condition information\nitems, and which ones are populated when a condition occurs, see\nhttp://dev.mysql.com/doc/refman/5.6/en/diagnostics-area.html#diagnostic\ns-area-information-items.\n\nHere is an example that uses GET DIAGNOSTICS and an exception handler\nin stored procedure context to assess the outcome of an insert\noperation. If the insert was successful, the procedure uses GET\nDIAGNOSTICS to get the rows-affected count. This shows that you can use\nGET DIAGNOSTICS multiple times to retrieve information about a\nstatement as long as the diagnostics area has not been cleared.\n\nCREATE PROCEDURE do_insert(value INT)\nBEGIN\n -- Declare variables to hold diagnostics area information\n DECLARE code CHAR(5) DEFAULT \'00000\';\n DECLARE msg TEXT;\n DECLARE rows INT;\n DECLARE result TEXT;\n -- Declare exception handler for failed insert\n DECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n BEGIN\n GET DIAGNOSTICS CONDITION 1\n code = RETURNED_SQLSTATE, msg = MESSAGE_TEXT;\n END;\n\n -- Perform the insert\n INSERT INTO t1 (int_col) VALUES(value);\n -- Check whether the insert was successful\n IF code = \'00000\' THEN\n GET DIAGNOSTICS rows = ROW_COUNT;\n SET result = CONCAT(\'insert succeeded, row count = \',rows);\n ELSE\n SET result = CONCAT(\'insert failed, error = \',code,\', message = \',msg);\n END IF;\n -- Say what happened\n SELECT result;\nEND;\n\nSuppose that t1.int_col is an integer column that is declared as NOT\nNULL. The procedure produces these results when invoked to insert\nnon-NULL and NULL values, respectively:\n\nmysql> CALL do_insert(1);\n+---------------------------------+\n| result |\n+---------------------------------+\n| insert succeeded, row count = 1 |\n+---------------------------------+\n\nmysql> CALL do_insert(NULL);\n+-------------------------------------------------------------------------+\n| result |\n+-------------------------------------------------------------------------+\n| insert failed, error = 23000, message = Column \'int_col\' cannot be null |\n+-------------------------------------------------------------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/get-diagnostics.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/get-diagnostics.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (187,24,'GET DIAGNOSTICS','Syntax:\nGET [CURRENT] DIAGNOSTICS\n{\n statement_information_item\n [, statement_information_item] ...\n | CONDITION condition_number\n condition_information_item\n [, condition_information_item] ...\n}\n\nstatement_information_item:\n target = statement_information_item_name\n\ncondition_information_item:\n target = condition_information_item_name\n\nstatement_information_item_name:\n NUMBER\n | ROW_COUNT\n\ncondition_information_item_name:\n CLASS_ORIGIN\n | SUBCLASS_ORIGIN\n | RETURNED_SQLSTATE\n | MESSAGE_TEXT\n | MYSQL_ERRNO\n | CONSTRAINT_CATALOG\n | CONSTRAINT_SCHEMA\n | CONSTRAINT_NAME\n | CATALOG_NAME\n | SCHEMA_NAME\n | TABLE_NAME\n | COLUMN_NAME\n | CURSOR_NAME\n\ncondition_number, target:\n (see following discussion)\n\nSQL statements produce diagnostic information that populates the\ndiagnostics area. The GET DIAGNOSTICS statement enables applications to\ninspect this information. It is available as of MySQL 5.6.4. (You can\nalso use SHOW WARNINGS or SHOW ERRORS to see conditions or errors.)\n\nNo special privileges are required to execute GET DIAGNOSTICS.\n\nThe keyword CURRENT means to retrieve information from the current\ndiagnostics area. In MySQL, it has no effect because that is the\ndefault behavior.\n\nGET DIAGNOSTICS is typically used in a handler within a stored program,\nbut it is a MySQL extension that it is permitted outside handler\ncontext to check the execution of any SQL statement. For example, if\nyou invoke the mysql client program, you can enter these statements at\nthe prompt:\n\nmysql> DROP TABLE test.no_such_table;\nERROR 1051 (42S02): Unknown table \'test.no_such_table\'\nmysql> GET DIAGNOSTICS CONDITION 1\n -> @p1 = RETURNED_SQLSTATE, @p2 = MESSAGE_TEXT;\nmysql> SELECT @p1, @p2;\n+-------+------------------------------------+\n| @p1 | @p2 |\n+-------+------------------------------------+\n| 42S02 | Unknown table \'test.no_such_table\' |\n+-------+------------------------------------+\n\nFor a description of the diagnostics area, see\nhttp://dev.mysql.com/doc/refman/5.6/en/diagnostics-area.html. Briefly,\nit contains two kinds of information:\n\no Statement information, such as the number of conditions that occurred\n or the affected-rows count.\n\no Condition information, such as the error code and message. If a\n statement raises multiple conditions, this part of the diagnostics\n area has a condition area for each one. If a statement raises no\n conditions, this part of the diagnostics area is empty.\n\nFor a statement that produces three conditions, the diagnostics area\ncontains statement and condition information like this:\n\nStatement information:\n row count\n ... other statement information items ...\nCondition area list:\n Condition area 1:\n error code for condition 1\n error message for condition 1\n ... other condition information items ...\n Condition area 2:\n error code for condition 2:\n error message for condition 2\n ... other condition information items ...\n Condition area 3:\n error code for condition 3\n error message for condition 3\n ... other condition information items ...\n\nGET DIAGNOSTICS can obtain either statement or condition information,\nbut not both in the same statement:\n\no To obtain statement information, retrieve the desired statement items\n into target variables. This instance of GET DIAGNOSTICS assigns the\n number of available conditions and the rows-affected count to the\n user variables @p1 and @p2:\n\nGET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;\n\no To obtain condition information, specify the condition number and\n retrieve the desired condition items into target variables. This\n instance of GET DIAGNOSTICS assigns the SQLSTATE value and error\n message to the user variables @p3 and @p4:\n\nGET DIAGNOSTICS CONDITION 1\n @p3 = RETURNED_SQLSTATE, @p4 = MESSAGE_TEXT;\n\nThe retrieval list specifies one or more target = item_name\nassignments, separated by commas. Each assignment names a target\nvariable and either a statement_information_item_name or\ncondition_information_item_name designator, depending on whether the\nstatement retrieves statement or condition information.\n\nValid target designators for storing item information can be stored\nprocedure or function parameters, stored program local variables\ndeclared with DECLARE, or user-defined variables.\n\nValid condition_number designators can be stored procedure or function\nparameters, stored program local variables declared with DECLARE,\nuser-defined variables, system variables, or literals. A character\nliteral may include a _charset introducer. A warning occurs if the\ncondition number is not in the range from 1 to the number of condition\nareas that have information. In this case, the warning is added to the\ndiagnostics area without clearing it.\n\nWhen a condition occurs, MySQL does not populate all condition items\nrecognized by GET DIAGNOSTICS. For example:\n\nmysql> GET DIAGNOSTICS CONDITION 1\n -> @p5 = SCHEMA_NAME, @p6 = TABLE_NAME;\nmysql> SELECT @p5, @p6;\n+------+------+\n| @p5 | @p6 |\n+------+------+\n| | |\n+------+------+\n\nIn standard SQL, if there are multiple conditions, the first condition\nrelates to the SQLSTATE value returned for the previous SQL statement.\nIn MySQL, this is not guaranteed. To get the main error, you cannot do\nthis:\n\nGET DIAGNOSTICS CONDITION 1 @errno = MYSQL_ERRNO;\n\nInstead, retrieve the condition count first, then use it to specify\nwhich condition number to inspect:\n\nGET DIAGNOSTICS @cno = NUMBER;\nGET DIAGNOSTICS CONDITION @cno @errno = MYSQL_ERRNO;\n\nFor information about permissible statement and condition information\nitems, and which ones are populated when a condition occurs, see\nhttp://dev.mysql.com/doc/refman/5.6/en/diagnostics-area.html#diagnostic\ns-area-information-items.\n\nHere is an example that uses GET DIAGNOSTICS and an exception handler\nin stored procedure context to assess the outcome of an insert\noperation. If the insert was successful, the procedure uses GET\nDIAGNOSTICS to get the rows-affected count. This shows that you can use\nGET DIAGNOSTICS multiple times to retrieve information about a\nstatement as long as the diagnostics area has not been cleared.\n\nCREATE PROCEDURE do_insert(value INT)\nBEGIN\n -- Declare variables to hold diagnostics area information\n DECLARE code CHAR(5) DEFAULT \'00000\';\n DECLARE msg TEXT;\n DECLARE rows INT;\n DECLARE result TEXT;\n -- Declare exception handler for failed insert\n DECLARE CONTINUE HANDLER FOR SQLEXCEPTION\n BEGIN\n GET DIAGNOSTICS CONDITION 1\n code = RETURNED_SQLSTATE, msg = MESSAGE_TEXT;\n END;\n\n -- Perform the insert\n INSERT INTO t1 (int_col) VALUES(value);\n -- Check whether the insert was successful\n IF code = \'00000\' THEN\n GET DIAGNOSTICS rows = ROW_COUNT;\n SET result = CONCAT(\'insert succeeded, row count = \',rows);\n ELSE\n SET result = CONCAT(\'insert failed, error = \',code,\', message = \',msg);\n END IF;\n -- Say what happened\n SELECT result;\nEND;\n\nSuppose that t1.int_col is an integer column that is declared as NOT\nNULL. The procedure produces these results when invoked to insert\nnon-NULL and NULL values, respectively:\n\nmysql> CALL do_insert(1);\n+---------------------------------+\n| result |\n+---------------------------------+\n| insert succeeded, row count = 1 |\n+---------------------------------+\n\nmysql> CALL do_insert(NULL);\n+-------------------------------------------------------------------------+\n| result |\n+-------------------------------------------------------------------------+\n| insert failed, error = 23000, message = Column \'int_col\' cannot be null |\n+-------------------------------------------------------------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/get-diagnostics.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/get-diagnostics.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (188,38,'NOT REGEXP','Syntax:\nexpr NOT REGEXP pat, expr NOT RLIKE pat\n\nThis is the same as NOT (expr REGEXP pat).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/regexp.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/regexp.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (189,24,'LEAVE','Syntax:\nLEAVE label\n\nThis statement is used to exit the flow control construct that has the\ngiven label. If the label is for the outermost stored program block,\nLEAVE exits the program.\n\nLEAVE can be used within BEGIN ... END or loop constructs (LOOP,\nREPEAT, WHILE).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/leave.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/leave.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (190,20,'NOT IN','Syntax:\nexpr NOT IN (value,...)\n\nThis is the same as NOT (expr IN (value,...)).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); @@ -298,11 +298,11 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (218,13,'ST_NUMPOINTS','ST_NumPoints(ls)\n\nReturns the number of Point objects in the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT ST_NumPoints(ST_GeomFromText(@ls));\n+------------------------------------+\n| ST_NumPoints(ST_GeomFromText(@ls)) |\n+------------------------------------+\n| 3 |\n+------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (219,32,'TIME FUNCTION','Syntax:\nTIME(expr)\n\nExtracts the time part of the time or datetime expression expr and\nreturns it as a string.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT TIME(\'2003-12-31 01:02:03\');\n -> \'01:02:03\'\nmysql> SELECT TIME(\'2003-12-31 01:02:03.000123\');\n -> \'01:02:03.000123\'\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (220,32,'DATE_ADD','Syntax:\nDATE_ADD(date,INTERVAL expr unit), DATE_SUB(date,INTERVAL expr unit)\n\nThese functions perform date arithmetic. The date argument specifies\nthe starting date or datetime value. expr is an expression specifying\nthe interval value to be added or subtracted from the starting date.\nexpr is a string; it may start with a "-" for negative intervals. unit\nis a keyword indicating the units in which the expression should be\ninterpreted.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT \'2008-12-31 23:59:59\' + INTERVAL 1 SECOND;\n -> \'2009-01-01 00:00:00\'\nmysql> SELECT INTERVAL 1 DAY + \'2008-12-31\';\n -> \'2009-01-01\'\nmysql> SELECT \'2005-01-01\' - INTERVAL 1 SECOND;\n -> \'2004-12-31 23:59:59\'\nmysql> SELECT DATE_ADD(\'2000-12-31 23:59:59\',\n -> INTERVAL 1 SECOND);\n -> \'2001-01-01 00:00:00\'\nmysql> SELECT DATE_ADD(\'2010-12-31 23:59:59\',\n -> INTERVAL 1 DAY);\n -> \'2011-01-01 23:59:59\'\nmysql> SELECT DATE_ADD(\'2100-12-31 23:59:59\',\n -> INTERVAL \'1:1\' MINUTE_SECOND);\n -> \'2101-01-01 00:01:00\'\nmysql> SELECT DATE_SUB(\'2005-01-01 00:00:00\',\n -> INTERVAL \'1 1:1:1\' DAY_SECOND);\n -> \'2004-12-30 22:58:59\'\nmysql> SELECT DATE_ADD(\'1900-01-01 00:00:00\',\n -> INTERVAL \'-1 10\' DAY_HOUR);\n -> \'1899-12-30 14:00:00\'\nmysql> SELECT DATE_SUB(\'1998-01-02\', INTERVAL 31 DAY);\n -> \'1997-12-02\'\nmysql> SELECT DATE_ADD(\'1992-12-31 23:59:59.000002\',\n -> INTERVAL \'1.999999\' SECOND_MICROSECOND);\n -> \'1993-01-01 00:00:01.000001\'\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (221,37,'ST_ENVELOPE','ST_Envelope(g)\n\nReturns the minimum bounding rectangle (MBR) for the geometry value g.\nThe result is returned as a Polygon value that is defined by the corner\npoints of the bounding box:\n\nPOLYGON((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_AsText(ST_Envelope(ST_GeomFromText(\'LineString(1 1,2 2)\')));\n+----------------------------------------------------------------+\n| ST_AsText(ST_Envelope(ST_GeomFromText(\'LineString(1 1,2 2)\'))) |\n+----------------------------------------------------------------+\n| POLYGON((1 1,2 1,2 2,1 2,1 1)) |\n+----------------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (221,37,'ST_ENVELOPE','ST_Envelope(g)\n\nReturns the minimum bounding rectangle (MBR) for the geometry value g,\nor NULL if the argument is NULL. The result is returned as a Polygon\nvalue that is defined by the corner points of the bounding box:\n\nPOLYGON((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_AsText(ST_Envelope(ST_GeomFromText(\'LineString(1 1,2 2)\')));\n+----------------------------------------------------------------+\n| ST_AsText(ST_Envelope(ST_GeomFromText(\'LineString(1 1,2 2)\'))) |\n+----------------------------------------------------------------+\n| POLYGON((1 1,2 1,2 2,1 2,1 1)) |\n+----------------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (222,38,'LIKE','Syntax:\nexpr LIKE pat [ESCAPE \'escape_char\']\n\nPattern matching using an SQL pattern. Returns 1 (TRUE) or 0 (FALSE).\nIf either expr or pat is NULL, the result is NULL.\n\nThe pattern need not be a literal string. For example, it can be\nspecified as a string expression or table column.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-comparison-functions.html\n\n','mysql> SELECT \'David!\' LIKE \'David_\';\n -> 1\nmysql> SELECT \'David!\' LIKE \'%D%v%\';\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/string-comparison-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (223,25,'MULTIPOINT','MultiPoint(pt1,pt2,...)\n\nConstructs a MultiPoint value using Point or WKB Point arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (224,19,'>>','Syntax:\n>>\n\nShifts a longlong (BIGINT) number to the right.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/bit-functions.html\n\n','mysql> SELECT 4 >> 2;\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/bit-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (225,24,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttp://dev.mysql.com/doc/refman/5.6/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/fetch.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/fetch.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (225,24,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttp://dev.mysql.com/doc/refman/5.6/en/cursors.html.\n\nBe aware that another operation, such as a SELECT or another FETCH, may\nalso cause the handler to execute by raising the same condition. If it\nis necessary to distinguish which operation raised the condition, place\nthe operation within its own BEGIN ... END block so that it can be\nassociated with its own handler.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/fetch.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/fetch.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (226,30,'TRUE FALSE','The constants TRUE and FALSE evaluate to 1 and 0, respectively. The\nconstant names can be written in any lettercase.\n\nmysql> SELECT TRUE, true, FALSE, false;\n -> 1, 1, 0, 0\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/boolean-literals.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/boolean-literals.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (227,7,'MBRWITHIN','MBRWithin(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangle of g1\nis within the minimum bounding rectangle of g2. This tests the opposite\nrelationship as MBRContains().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html\n\n','mysql> SET @g1 = ST_GeomFromText(\'Polygon((0 0,0 3,3 3,3 0,0 0))\');\nmysql> SET @g2 = ST_GeomFromText(\'Polygon((0 0,0 5,5 5,5 0,0 0))\');\nmysql> SELECT MBRWithin(@g1,@g2), MBRWithin(@g2,@g1);\n+--------------------+--------------------+\n| MBRWithin(@g1,@g2) | MBRWithin(@g2,@g1) |\n+--------------------+--------------------+\n| 1 | 0 |\n+--------------------+--------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-mysql-specific.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (228,17,'SESSION_USER','Syntax:\nSESSION_USER()\n\nSESSION_USER() is a synonym for USER().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/information-functions.html'); @@ -320,7 +320,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (240,32,'PERIOD_ADD','Syntax:\nPERIOD_ADD(P,N)\n\nAdds N months to period P (in the format YYMM or YYYYMM). Returns a\nvalue in the format YYYYMM.\n\n*Note*: The period argument P is not a date value.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT PERIOD_ADD(200801,2);\n -> 200803\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (241,38,'RIGHT','Syntax:\nRIGHT(str,len)\n\nReturns the rightmost len characters from the string str, or NULL if\nany argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT RIGHT(\'foobarbar\', 4);\n -> \'rbar\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (242,40,'DROP TABLESPACE','Syntax:\nDROP TABLESPACE tablespace_name\n ENGINE [=] engine_name\n\nThis statement drops a tablespace that was previously created using\nCREATE TABLESPACE (see [HELP CREATE TABLESPACE]).\n\n*Important*: The tablespace to be dropped must not contain any data\nfiles; in other words, before you can drop a tablespace, you must first\ndrop each of its data files using ALTER TABLESPACE ... DROP DATAFILE\n(see [HELP ALTER TABLESPACE]).\n\nThe ENGINE clause (required) specifies the storage engine used by the\ntablespace. Currently, the only accepted values for engine_name are NDB\nand NDBCLUSTER.\n\nDROP TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.6/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/drop-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/drop-tablespace.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (243,21,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption = {\n FOR UPGRADE\n | QUICK\n | FAST\n | MEDIUM\n | EXTENDED\n | CHANGED\n}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE works for\nInnoDB, MyISAM, ARCHIVE, and CSV tables. For MyISAM tables, the key\nstatistics are updated as well.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE can also check views for problems, such as tables that are\nreferenced in the view definition that no longer exist.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-maintenance.html.\n\nIn MySQL 5.6.11 only, gtid_next must be set to AUTOMATIC before issuing\nthis statement. (Bug #16062608, Bug #16715809, Bug #69045)\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/check-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/check-table.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (243,21,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption = {\n FOR UPGRADE\n | QUICK\n | FAST\n | MEDIUM\n | EXTENDED\n | CHANGED\n}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE works for\nInnoDB, MyISAM, ARCHIVE, and CSV tables. For MyISAM tables, the key\nstatistics are updated as well.\n\nBefore running CHECK TABLE on InnoDB tables, see\nhttp://dev.mysql.com/doc/refman/5.6/en/check-table.html#check-table-inn\nodb.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE can also check views for problems, such as tables that are\nreferenced in the view definition that no longer exist.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-maintenance.html.\n\nIn MySQL 5.6.11 only, gtid_next must be set to AUTOMATIC before issuing\nthis statement. (Bug #16062608, Bug #16715809, Bug #69045)\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/check-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/check-table.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (244,38,'BIN','Syntax:\nBIN(N)\n\nReturns a string representation of the binary value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,2). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT BIN(12);\n -> \'1100\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (245,25,'MULTILINESTRING','MultiLineString(ls1,ls2,...)\n\nConstructs a MultiLineString value using LineString or WKB LineString\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (246,27,'SHOW RELAYLOG EVENTS','Syntax:\nSHOW RELAYLOG EVENTS\n [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the relay log of a replication slave. If you do not\nspecify \'log_name\', the first relay log is displayed. This statement\nhas no effect on the master.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-relaylog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-relaylog-events.html'); @@ -348,7 +348,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (268,21,'REPAIR TABLE','Syntax:\nREPAIR [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n tbl_name [, tbl_name] ...\n [QUICK] [EXTENDED] [USE_FRM]\n\nREPAIR TABLE repairs a possibly corrupted table, for certain storage\nengines only. By default, it has the same effect as myisamchk --recover\ntbl_name. REPAIR TABLE works for MyISAM, ARCHIVE, and CSV tables. See\nhttp://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html\nhttp://dev.mysql.com/doc/refman/5.6/en/archive-storage-engine.html, and\nhttp://dev.mysql.com/doc/refman/5.6/en/csv-storage-engine.html. This\nstatement does not work with views.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nREPAIR TABLE is supported for partitioned tables. However, the USE_FRM\noption cannot be used with this statement on a partitioned table.\n\nIn MySQL 5.6.11 only, gtid_next must be set to AUTOMATIC before issuing\nthis statement. (Bug #16062608, Bug #16715809, Bug #69045)\n\nYou can use ALTER TABLE ... REPAIR PARTITION to repair one or more\npartitions; for more information, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/repair-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/repair-table.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (269,18,'MERGE','The MERGE storage engine, also known as the MRG_MyISAM engine, is a\ncollection of identical MyISAM tables that can be used as one.\n"Identical" means that all tables have identical column and index\ninformation. You cannot merge MyISAM tables in which the columns are\nlisted in a different order, do not have exactly the same columns, or\nhave the indexes in different order. However, any or all of the MyISAM\ntables can be compressed with myisampack. See\nhttp://dev.mysql.com/doc/refman/5.6/en/myisampack.html. Differences in\ntable options such as AVG_ROW_LENGTH, MAX_ROWS, or PACK_KEYS do not\nmatter.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/merge-storage-engine.html\n\n','mysql> CREATE TABLE t1 (\n -> a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n -> message CHAR(20)) ENGINE=MyISAM;\nmysql> CREATE TABLE t2 (\n -> a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n -> message CHAR(20)) ENGINE=MyISAM;\nmysql> INSERT INTO t1 (message) VALUES (\'Testing\'),(\'table\'),(\'t1\');\nmysql> INSERT INTO t2 (message) VALUES (\'Testing\'),(\'table\'),(\'t2\');\nmysql> CREATE TABLE total (\n -> a INT NOT NULL AUTO_INCREMENT,\n -> message CHAR(20), INDEX(a))\n -> ENGINE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST;\n','http://dev.mysql.com/doc/refman/5.6/en/merge-storage-engine.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (270,31,'ST_DISTANCE','ST_Distance(g1,g2)\n\nReturns the distance between g1 and g2.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-object-shapes.html\n\n','mysql> SET @g1 = POINT(1,1), @g2 = POINT(2,2);\nmysql> SELECT ST_Distance(@g1, @g2);\n+-----------------------+\n| ST_Distance(@g1, @g2) |\n+-----------------------+\n| 1.4142135623730951 |\n+-----------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions-object-shapes.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (271,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n (create_definition,...)\n [table_options]\n [partition_options]\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n [(create_definition,...)]\n [table_options]\n [partition_options]\n [IGNORE | REPLACE]\n [AS] query_expression\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition:\n col_name column_definition\n | [CONSTRAINT [symbol]] PRIMARY KEY [index_type] (index_col_name,...)\n [index_option] ...\n | {INDEX|KEY} [index_name] [index_type] (index_col_name,...)\n [index_option] ...\n | [CONSTRAINT [symbol]] UNIQUE [INDEX|KEY]\n [index_name] [index_type] (index_col_name,...)\n [index_option] ...\n | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (index_col_name,...)\n [index_option] ...\n | [CONSTRAINT [symbol]] FOREIGN KEY\n [index_name] (index_col_name,...) reference_definition\n | CHECK (expr)\n\ncolumn_definition:\n data_type [NOT NULL | NULL] [DEFAULT default_value]\n [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]\n [COMMENT \'string\']\n [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]\n [STORAGE {DISK|MEMORY|DEFAULT}]\n [reference_definition]\n\ndata_type:\n BIT[(length)]\n | TINYINT[(length)] [UNSIGNED] [ZEROFILL]\n | SMALLINT[(length)] [UNSIGNED] [ZEROFILL]\n | MEDIUMINT[(length)] [UNSIGNED] [ZEROFILL]\n | INT[(length)] [UNSIGNED] [ZEROFILL]\n | INTEGER[(length)] [UNSIGNED] [ZEROFILL]\n | BIGINT[(length)] [UNSIGNED] [ZEROFILL]\n | REAL[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | DOUBLE[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | FLOAT[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | DECIMAL[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n | NUMERIC[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n | DATE\n | TIME[(fsp)]\n | TIMESTAMP[(fsp)]\n | DATETIME[(fsp)]\n | YEAR\n | CHAR[(length)] [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | VARCHAR(length) [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | BINARY[(length)]\n | VARBINARY(length)\n | TINYBLOB\n | BLOB\n | MEDIUMBLOB\n | LONGBLOB\n | TINYTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | TEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | MEDIUMTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | LONGTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | ENUM(value1,value2,value3,...)\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | SET(value1,value2,value3,...)\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | spatial_type\n\nindex_col_name:\n col_name [(length)] [ASC | DESC]\n\nindex_type:\n USING {BTREE | HASH}\n\nindex_option:\n KEY_BLOCK_SIZE [=] value\n | index_type\n | WITH PARSER parser_name\n | COMMENT \'string\'\n\nreference_definition:\n REFERENCES tbl_name (index_col_name,...)\n [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n [ON DELETE reference_option]\n [ON UPDATE reference_option]\n\nreference_option:\n RESTRICT | CASCADE | SET NULL | NO ACTION\n\ntable_options:\n table_option [[,] table_option] ...\n\ntable_option:\n ENGINE [=] engine_name\n | AUTO_INCREMENT [=] value\n | AVG_ROW_LENGTH [=] value\n | [DEFAULT] CHARACTER SET [=] charset_name\n | CHECKSUM [=] {0 | 1}\n | [DEFAULT] COLLATE [=] collation_name\n | COMMENT [=] \'string\'\n | CONNECTION [=] \'connect_string\'\n | DATA DIRECTORY [=] \'absolute path to directory\'\n | DELAY_KEY_WRITE [=] {0 | 1}\n | INDEX DIRECTORY [=] \'absolute path to directory\'\n | INSERT_METHOD [=] { NO | FIRST | LAST }\n | KEY_BLOCK_SIZE [=] value\n | MAX_ROWS [=] value\n | MIN_ROWS [=] value\n | PACK_KEYS [=] {0 | 1 | DEFAULT}\n | PASSWORD [=] \'string\'\n | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}\n | STATS_AUTO_RECALC [=] {DEFAULT|0|1}\n | STATS_PERSISTENT [=] {DEFAULT|0|1}\n | STATS_SAMPLE_PAGES [=] value\n | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY|DEFAULT}]\n | UNION [=] (tbl_name[,tbl_name]...)\n\npartition_options:\n PARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY [ALGORITHM={1|2}] (column_list)\n | RANGE{(expr) | COLUMNS(column_list)}\n | LIST{(expr) | COLUMNS(column_list)} }\n [PARTITIONS num]\n [SUBPARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY [ALGORITHM={1|2}] (column_list) }\n [SUBPARTITIONS num]\n ]\n [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n PARTITION partition_name\n [VALUES \n {LESS THAN {(expr | value_list) | MAXVALUE} \n | \n IN (value_list)}]\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n SUBPARTITION logical_name\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n\nquery_expression:\n SELECT ... (Some valid select or union statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nRules for permissible table names are given in\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html. By default,\nthe table is created in the default database, using the InnoDB storage\nengine. An error occurs if the table exists, if there is no default\ndatabase, or if the database does not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-table.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (271,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n (create_definition,...)\n [table_options]\n [partition_options]\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n [(create_definition,...)]\n [table_options]\n [partition_options]\n [IGNORE | REPLACE]\n [AS] query_expression\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition:\n col_name column_definition\n | [CONSTRAINT [symbol]] PRIMARY KEY [index_type] (index_col_name,...)\n [index_option] ...\n | {INDEX|KEY} [index_name] [index_type] (index_col_name,...)\n [index_option] ...\n | [CONSTRAINT [symbol]] UNIQUE [INDEX|KEY]\n [index_name] [index_type] (index_col_name,...)\n [index_option] ...\n | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (index_col_name,...)\n [index_option] ...\n | [CONSTRAINT [symbol]] FOREIGN KEY\n [index_name] (index_col_name,...) reference_definition\n | CHECK (expr)\n\ncolumn_definition:\n data_type [NOT NULL | NULL] [DEFAULT default_value]\n [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]\n [COMMENT \'string\']\n [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]\n [STORAGE {DISK|MEMORY|DEFAULT}]\n [reference_definition]\n\ndata_type:\n BIT[(length)]\n | TINYINT[(length)] [UNSIGNED] [ZEROFILL]\n | SMALLINT[(length)] [UNSIGNED] [ZEROFILL]\n | MEDIUMINT[(length)] [UNSIGNED] [ZEROFILL]\n | INT[(length)] [UNSIGNED] [ZEROFILL]\n | INTEGER[(length)] [UNSIGNED] [ZEROFILL]\n | BIGINT[(length)] [UNSIGNED] [ZEROFILL]\n | REAL[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | DOUBLE[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | FLOAT[(length,decimals)] [UNSIGNED] [ZEROFILL]\n | DECIMAL[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n | NUMERIC[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n | DATE\n | TIME[(fsp)]\n | TIMESTAMP[(fsp)]\n | DATETIME[(fsp)]\n | YEAR\n | CHAR[(length)] [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | VARCHAR(length) [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | BINARY[(length)]\n | VARBINARY(length)\n | TINYBLOB\n | BLOB\n | MEDIUMBLOB\n | LONGBLOB\n | TINYTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | TEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | MEDIUMTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | LONGTEXT [BINARY]\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | ENUM(value1,value2,value3,...)\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | SET(value1,value2,value3,...)\n [CHARACTER SET charset_name] [COLLATE collation_name]\n | spatial_type\n\nindex_col_name:\n col_name [(length)] [ASC | DESC]\n\nindex_type:\n USING {BTREE | HASH}\n\nindex_option:\n KEY_BLOCK_SIZE [=] value\n | index_type\n | WITH PARSER parser_name\n | COMMENT \'string\'\n\nreference_definition:\n REFERENCES tbl_name (index_col_name,...)\n [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n [ON DELETE reference_option]\n [ON UPDATE reference_option]\n\nreference_option:\n RESTRICT | CASCADE | SET NULL | NO ACTION\n\ntable_options:\n table_option [[,] table_option] ...\n\ntable_option:\n ENGINE [=] engine_name\n | AUTO_INCREMENT [=] value\n | AVG_ROW_LENGTH [=] value\n | [DEFAULT] CHARACTER SET [=] charset_name\n | CHECKSUM [=] {0 | 1}\n | [DEFAULT] COLLATE [=] collation_name\n | COMMENT [=] \'string\'\n | CONNECTION [=] \'connect_string\'\n | DATA DIRECTORY [=] \'absolute path to directory\'\n | DELAY_KEY_WRITE [=] {0 | 1}\n | INDEX DIRECTORY [=] \'absolute path to directory\'\n | INSERT_METHOD [=] { NO | FIRST | LAST }\n | KEY_BLOCK_SIZE [=] value\n | MAX_ROWS [=] value\n | MIN_ROWS [=] value\n | PACK_KEYS [=] {0 | 1 | DEFAULT}\n | PASSWORD [=] \'string\'\n | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}\n | STATS_AUTO_RECALC [=] {DEFAULT|0|1}\n | STATS_PERSISTENT [=] {DEFAULT|0|1}\n | STATS_SAMPLE_PAGES [=] value\n | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY|DEFAULT}]\n | UNION [=] (tbl_name[,tbl_name]...)\n\npartition_options:\n PARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY [ALGORITHM={1|2}] (column_list)\n | RANGE{(expr) | COLUMNS(column_list)}\n | LIST{(expr) | COLUMNS(column_list)} }\n [PARTITIONS num]\n [SUBPARTITION BY\n { [LINEAR] HASH(expr)\n | [LINEAR] KEY [ALGORITHM={1|2}] (column_list) }\n [SUBPARTITIONS num]\n ]\n [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n PARTITION partition_name\n [VALUES\n {LESS THAN {(expr | value_list) | MAXVALUE}\n |\n IN (value_list)}]\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n SUBPARTITION logical_name\n [[STORAGE] ENGINE [=] engine_name]\n [COMMENT [=] \'comment_text\' ]\n [DATA DIRECTORY [=] \'data_dir\']\n [INDEX DIRECTORY [=] \'index_dir\']\n [MAX_ROWS [=] max_number_of_rows]\n [MIN_ROWS [=] min_number_of_rows]\n [TABLESPACE [=] tablespace_name]\n [NODEGROUP [=] node_group_id]\n\nquery_expression:\n SELECT ... (Some valid select or union statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nRules for permissible table names are given in\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html. By default,\nthe table is created in the default database, using the InnoDB storage\nengine. An error occurs if the table exists, if there is no default\ndatabase, or if the database does not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-table.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (272,32,'MICROSECOND','Syntax:\nMICROSECOND(expr)\n\nReturns the microseconds from the time or datetime expression expr as a\nnumber in the range from 0 to 999999.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT MICROSECOND(\'12:00:00.123456\');\n -> 123456\nmysql> SELECT MICROSECOND(\'2009-12-31 23:59:59.000010\');\n -> 10\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (273,40,'CREATE SERVER','Syntax:\nCREATE SERVER server_name\n FOREIGN DATA WRAPPER wrapper_name\n OPTIONS (option [, option] ...)\n\noption:\n { HOST character-literal\n | DATABASE character-literal\n | USER character-literal\n | PASSWORD character-literal\n | SOCKET character-literal\n | OWNER character-literal\n | PORT numeric-literal }\n\nThis statement creates the definition of a server for use with the\nFEDERATED storage engine. The CREATE SERVER statement creates a new row\nin the servers table in the mysql database. This statement requires the\nSUPER privilege.\n\nThe server_name should be a unique reference to the server. Server\ndefinitions are global within the scope of the server, it is not\npossible to qualify the server definition to a specific database.\nserver_name has a maximum length of 64 characters (names longer than 64\ncharacters are silently truncated), and is case insensitive. You may\nspecify the name as a quoted string.\n\nThe wrapper_name should be mysql, and may be quoted with single\nquotation marks. Other values for wrapper_name are not currently\nsupported.\n\nFor each option you must specify either a character literal or numeric\nliteral. Character literals are UTF-8, support a maximum length of 64\ncharacters and default to a blank (empty) string. String literals are\nsilently truncated to 64 characters. Numeric literals must be a number\nbetween 0 and 9999, default value is 0.\n\n*Note*: The OWNER option is currently not applied, and has no effect on\nthe ownership or operation of the server connection that is created.\n\nThe CREATE SERVER statement creates an entry in the mysql.servers table\nthat can later be used with the CREATE TABLE statement when creating a\nFEDERATED table. The options that you specify will be used to populate\nthe columns in the mysql.servers table. The table columns are\nServer_name, Host, Db, Username, Password, Port and Socket.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-server.html\n\n','CREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE \'test\');\n','http://dev.mysql.com/doc/refman/5.6/en/create-server.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (274,33,'ST_POLYFROMWKB','ST_PolyFromWKB(wkb[,srid]), ST_PolygonFromWKB(wkb[,srid])\n\nConstructs a Polygon value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html'); @@ -371,10 +371,10 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (291,38,'MAKE_SET','Syntax:\nMAKE_SET(bits,str1,str2,...)\n\nReturns a set value (a string containing substrings separated by ","\ncharacters) consisting of the strings that have the corresponding bit\nin bits set. str1 corresponds to bit 0, str2 to bit 1, and so on. NULL\nvalues in str1, str2, ... are not appended to the result.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT MAKE_SET(1,\'a\',\'b\',\'c\');\n -> \'a\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',\'world\');\n -> \'hello,world\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',NULL,\'world\');\n -> \'hello\'\nmysql> SELECT MAKE_SET(0,\'a\',\'b\',\'c\');\n -> \'\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (292,38,'FIND_IN_SET','Syntax:\nFIND_IN_SET(str,strlist)\n\nReturns a value in the range of 1 to N if the string str is in the\nstring list strlist consisting of N substrings. A string list is a\nstring composed of substrings separated by "," characters. If the first\nargument is a constant string and the second is a column of type SET,\nthe FIND_IN_SET() function is optimized to use bit arithmetic. Returns\n0 if str is not in strlist or if strlist is the empty string. Returns\nNULL if either argument is NULL. This function does not work properly\nif the first argument contains a comma (",") character.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT FIND_IN_SET(\'b\',\'a,b,c,d\');\n -> 2\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (293,16,'MIN','Syntax:\nMIN([DISTINCT] expr)\n\nReturns the minimum value of expr. MIN() may take a string argument; in\nsuch cases, it returns the minimum string value. See\nhttp://dev.mysql.com/doc/refman/5.6/en/mysql-indexes.html. The DISTINCT\nkeyword can be used to find the minimum of the distinct values of expr,\nhowever, this produces the same result as omitting DISTINCT.\n\nMIN() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html\n\n','mysql> SELECT student_name, MIN(test_score), MAX(test_score)\n -> FROM student\n -> GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (294,28,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)] \n [(col_name,...)]\n {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)] \n SET col_name={expr | DEFAULT}, ...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)] \n [(col_name,...)]\n SELECT ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttp://dev.mysql.com/doc/refman/5.6/en/insert-on-duplicate.html.\n\n*Note*: REPLACE makes sense only if a table has a PRIMARY KEY or UNIQUE\nindex. Otherwise, it becomes equivalent to INSERT, because there is no\nindex to be used to determine whether a new row duplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nBeginning with MySQL 5.6.2, REPLACE supports explicit partition\nselection using the PARTITION option with a comma-separated list of\nnames of partitions, subpartitions, or both. As with INSERT, if it is\nnot possible to insert the new row into any of these partitions or\nsubpartitions, the REPLACE statement fails with the error Found a row\nnot matching the given partition set. See\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html, for\nmore information.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/replace.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/replace.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (294,28,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n [(col_name,...)]\n {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n SET col_name={expr | DEFAULT}, ...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n [(col_name,...)]\n SELECT ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttp://dev.mysql.com/doc/refman/5.6/en/insert-on-duplicate.html.\n\n*Note*: REPLACE makes sense only if a table has a PRIMARY KEY or UNIQUE\nindex. Otherwise, it becomes equivalent to INSERT, because there is no\nindex to be used to determine whether a new row duplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nBeginning with MySQL 5.6.2, REPLACE supports explicit partition\nselection using the PARTITION option with a comma-separated list of\nnames of partitions, subpartitions, or both. As with INSERT, if it is\nnot possible to insert the new row into any of these partitions or\nsubpartitions, the REPLACE statement fails with the error Found a row\nnot matching the given partition set. See\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html, for\nmore information.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/replace.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/replace.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (295,32,'CURRENT_TIMESTAMP','Syntax:\nCURRENT_TIMESTAMP, CURRENT_TIMESTAMP([fsp])\n\nCURRENT_TIMESTAMP and CURRENT_TIMESTAMP() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (296,26,'ST_SYMDIFFERENCE','ST_SymDifference(g1, g2)\n\nReturns a geometry that represents the point set symmetric difference\nof the geometry values g1 and g2, which is defined as:\n\ng1 symdifference g2 := (g1 union g2) difference (g1 intersection g2)\n\nOr, in function call notation:\n\nST_SymDifference(g1, g2) = ST_Difference(ST_Union(g1, g2), ST_Intersection(g1, g2))\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/spatial-operator-functions.html\n\n','mysql> SET @g1 = POINT(1,1), @g2 = POINT(2,2);\nmysql> SELECT ST_AsText(ST_SymDifference(@g1, @g2));\n+---------------------------------------+\n| ST_AsText(ST_SymDifference(@g1, @g2)) |\n+---------------------------------------+\n| MULTIPOINT(1 1,2 2) |\n+---------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/spatial-operator-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (297,7,'GTID_SUBSET','Syntax:\nGTID_SUBSET(subset,set)\n\nGiven two sets of global transaction IDs subset and set, returns true\n(1) if all GTIDs in subset are also in set. Returns false (0)\notherwise.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html\n\n','mysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 1\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-25\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-25\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 1\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 0\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (297,7,'GTID_SUBSET','Syntax:\nGTID_SUBSET(subset,set)\n\nGiven two sets of global transaction IDs subset and set, returns true\n(1) if all GTIDs in subset are also in set. Returns false (0)\notherwise.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html\n\n','mysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 1\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-25\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-25\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 1\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\')\\G\n*************************** 1. row ***************************\nGTID_SUBSET(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\'): 0\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (298,16,'VAR_SAMP','Syntax:\nVAR_SAMP(expr)\n\nReturns the sample variance of expr. That is, the denominator is the\nnumber of rows minus one.\n\nVAR_SAMP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (299,23,'DATETIME','DATETIME[(fsp)]\n\nA date and time combination. The supported range is \'1000-01-01\n00:00:00.000000\' to \'9999-12-31 23:59:59.999999\'. MySQL displays\nDATETIME values in \'YYYY-MM-DD HH:MM:SS[.fraction]\' format, but permits\nassignment of values to DATETIME columns using either strings or\nnumbers.\n\nAs of MySQL 5.6.4, an optional fsp value in the range from 0 to 6 may\nbe given to specify fractional seconds precision. A value of 0\nsignifies that there is no fractional part. If omitted, the default\nprecision is 0.\n\nAs of MySQL 5.6.5, automatic initialization and updating to the current\ndate and time for DATETIME columns can be specified using DEFAULT and\nON UPDATE column definition clauses, as described in\nhttp://dev.mysql.com/doc/refman/5.6/en/timestamp-initialization.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-type-overview.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (300,23,'INTEGER','INTEGER[(M)] [UNSIGNED] [ZEROFILL]\n\nThis type is a synonym for INT.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); @@ -386,12 +386,12 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (306,32,'WEEK','Syntax:\nWEEK(date[,mode])\n\nThis function returns the week number for date. The two-argument form\nof WEEK() enables you to specify whether the week starts on Sunday or\nMonday and whether the return value should be in the range from 0 to 53\nor from 1 to 53. If the mode argument is omitted, the value of the\ndefault_week_format system variable is used. See\nhttp://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT WEEK(\'2008-02-20\');\n -> 7\nmysql> SELECT WEEK(\'2008-02-20\',0);\n -> 7\nmysql> SELECT WEEK(\'2008-02-20\',1);\n -> 8\nmysql> SELECT WEEK(\'2008-12-31\',1);\n -> 53\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (307,22,'DROP FUNCTION UDF','Syntax:\nDROP FUNCTION function_name\n\nThis statement drops the user-defined function (UDF) named\nfunction_name.\n\nTo drop a function, you must have the DELETE privilege for the mysql\ndatabase. This is because DROP FUNCTION removes a row from the\nmysql.func system table that records the function\'s name, type, and\nshared library name.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/drop-function-udf.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/drop-function-udf.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (308,38,'UPDATEXML','Syntax:\nUpdateXML(xml_target, xpath_expr, new_xml)\n\nThis function replaces a single portion of a given fragment of XML\nmarkup xml_target with a new XML fragment new_xml, and then returns the\nchanged XML. The portion of xml_target that is replaced matches an\nXPath expression xpath_expr supplied by the user. In MySQL 5.6.6 and\nearlier, the XPath expression could contain at most 127 characters.\nThis limitation is lifted in MySQL 5.6.7. (Bug #13007062, Bug #62429)\n\nIf no expression matching xpath_expr is found, or if multiple matches\nare found, the function returns the original xml_target XML fragment.\nAll three arguments should be strings.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/xml-functions.html\n\n','mysql> SELECT\n -> UpdateXML(\'ccc\', \'/a\', \'fff\') AS val1,\n -> UpdateXML(\'ccc\', \'/b\', \'fff\') AS val2,\n -> UpdateXML(\'ccc\', \'//b\', \'fff\') AS val3,\n -> UpdateXML(\'ccc\', \'/a/d\', \'fff\') AS val4,\n -> UpdateXML(\'ccc\', \'/a/d\', \'fff\') AS val5\n -> \\G\n\n*************************** 1. row ***************************\nval1: fff\nval2: ccc\nval3: fff\nval4: cccfff\nval5: ccc\n','http://dev.mysql.com/doc/refman/5.6/en/xml-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (309,8,'RESET SLAVE','Syntax:\nRESET SLAVE [ALL]\n\nRESET SLAVE makes the slave forget its replication position in the\nmaster\'s binary log. This statement is meant to be used for a clean\nstart: It clears the master info and relay log info repositories,\ndeletes all the relay log files, and starts a new relay log file. It\nalso resets to 0 the replication delay specified with the MASTER_DELAY\noption to CHANGE MASTER TO. To use RESET SLAVE, the slave replication\nthreads must be stopped (use STOP SLAVE if necessary).\n\n*Note*: All relay log files are deleted, even if they have not been\ncompletely executed by the slave SQL thread. (This is a condition\nlikely to exist on a replication slave if you have issued a STOP SLAVE\nstatement or if the slave is highly loaded.)\n\nIn MySQL 5.6 (unlike the case in MySQL 5.1 and earlier), RESET SLAVE\ndoes not change any replication connection parameters such as master\nhost, master port, master user, or master password, which are retained\nin memory. This means that START SLAVE can be issued without requiring\na CHANGE MASTER TO statement following RESET SLAVE.\n\nConnection parameters are reset if the slave mysqld is shut down\nfollowing RESET SLAVE. In MySQL 5.6.3 and later, you can instead use\nRESET SLAVE ALL to reset these connection parameters (Bug #11809016).\n\nRESET SLAVE ALL does not clear the IGNORE_SERVER_IDS list set by CHANGE\nMASTER TO. This issue is fixed in MySQL 5.7. (Bug #18816897)\n\nIn MySQL 5.6.7 and later, RESET SLAVE causes an implicit commit of an\nongoing transaction. See\nhttp://dev.mysql.com/doc/refman/5.6/en/implicit-commit.html.\n\nIf the slave SQL thread was in the middle of replicating temporary\ntables when it was stopped, and RESET SLAVE is issued, these replicated\ntemporary tables are deleted on the slave.\n\n*Note*: When used on a MySQL Cluster replication slave SQL node, RESET\nSLAVE clears the mysql.ndb_apply_status table. You should keep in mind\nwhen using this statement that ndb_apply_status uses the NDB storage\nengine and so is shared by all SQL nodes attached to the slave cluster.\nBeginning with MySQL Cluster NDB 7.4.9, you can override this behavior\nby issuing SET GLOBAL @ndb_clear_apply_status=OFF prior to executing\nRESET SLAVE, which keeps the slave from purging the ndb_apply_status\ntable in such cases.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/reset-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/reset-slave.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (309,8,'RESET SLAVE','Syntax:\nRESET SLAVE [ALL]\n\nRESET SLAVE makes the slave forget its replication position in the\nmaster\'s binary log. This statement is meant to be used for a clean\nstart: It clears the master info and relay log info repositories,\ndeletes all the relay log files, and starts a new relay log file. It\nalso resets to 0 the replication delay specified with the MASTER_DELAY\noption to CHANGE MASTER TO. To use RESET SLAVE, the slave replication\nthreads must be stopped (use STOP SLAVE if necessary).\n\n*Note*: All relay log files are deleted, even if they have not been\ncompletely executed by the slave SQL thread. (This is a condition\nlikely to exist on a replication slave if you have issued a STOP SLAVE\nstatement or if the slave is highly loaded.)\n\nIn MySQL 5.6 (unlike the case in MySQL 5.1 and earlier), RESET SLAVE\ndoes not change any replication connection parameters such as master\nhost, master port, master user, or master password, which are retained\nin memory. This means that START SLAVE can be issued without requiring\na CHANGE MASTER TO statement following RESET SLAVE.\n\nConnection parameters are reset if the slave mysqld is shut down\nfollowing RESET SLAVE. In MySQL 5.6.3 and later, you can instead use\nRESET SLAVE ALL to reset these connection parameters (Bug #11809016).\n\nRESET SLAVE ALL does not clear the IGNORE_SERVER_IDS list set by CHANGE\nMASTER TO. This issue is fixed in MySQL 5.7. (Bug #18816897)\n\nIn MySQL 5.6.7 and later, RESET SLAVE causes an implicit commit of an\nongoing transaction. See\nhttp://dev.mysql.com/doc/refman/5.6/en/implicit-commit.html.\n\nIf the slave SQL thread was in the middle of replicating temporary\ntables when it was stopped, and RESET SLAVE is issued, these replicated\ntemporary tables are deleted on the slave.\n\n*Note*: When used on a MySQL Cluster replication slave SQL node, RESET\nSLAVE clears the mysql.ndb_apply_status table. You should keep in mind\nwhen using this statement that ndb_apply_status uses the NDB storage\nengine and so is shared by all SQL nodes attached to the slave cluster.\nBeginning with MySQL Cluster NDB 7.4.9, you can override this behavior\nby issuing SET GLOBAL @@ndb_clear_apply_status=OFF prior to executing\nRESET SLAVE, which keeps the slave from purging the ndb_apply_status\ntable in such cases.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/reset-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/reset-slave.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (310,32,'DAY','Syntax:\nDAY(date)\n\nDAY() is a synonym for DAYOFMONTH().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (311,14,'UUID','Syntax:\nUUID()\n\nReturns a Universal Unique Identifier (UUID) generated according to RFC\n4122, "A Universally Unique IDentifier (UUID) URN Namespace"\n(http://www.ietf.org/rfc/rfc4122.txt).\n\nA UUID is designed as a number that is globally unique in space and\ntime. Two calls to UUID() are expected to generate two different\nvalues, even if these calls are performed on two separate devices not\nconnected to each other.\n\n*Warning*: Although UUID() values are intended to be unique, they are\nnot necessarily unguessable or unpredictable. If unpredictability is\nrequired, UUID values should be generated some other way.\n\nUUID() returns a value that conforms to UUID version 1 as described in\nRFC 4122. The value is a 128-bit number represented as a utf8 string of\nfive hexadecimal numbers in aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\nformat:\n\no The first three numbers are generated from the low, middle, and high\n parts of a timestamp. The high part also includes the UUID version\n number.\n\no The fourth number preserves temporal uniqueness in case the timestamp\n value loses monotonicity (for example, due to daylight saving time).\n\no The fifth number is an IEEE 802 node number that provides spatial\n uniqueness. A random number is substituted if the latter is not\n available (for example, because the host device has no Ethernet card,\n or it is unknown how to find the hardware address of an interface on\n the host operating system). In this case, spatial uniqueness cannot\n be guaranteed. Nevertheless, a collision should have very low\n probability.\n\n The MAC address of an interface is taken into account only on FreeBSD\n and Linux. On other operating systems, MySQL uses a randomly\n generated 48-bit number.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID();\n -> \'6ccd780c-baba-1026-9564-0040f4311e29\'\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (312,25,'LINESTRING','LineString(pt1,pt2,...)\n\nConstructs a LineString value from a number of Point or WKB Point\narguments. If the number of arguments is less than two, the return\nvalue is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-mysql-specific-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (313,14,'SLEEP','Syntax:\nSLEEP(duration)\n\nSleeps (pauses) for the number of seconds given by the duration\nargument, then returns 0. If SLEEP() is interrupted, it returns 1. The\nduration may have a fractional part.\n\nWhen sleep returns normally (without interruption), it returns 0:\n\nmysql> SELECT SLEEP(1000);\n+-------------+\n| SLEEP(1000) |\n+-------------+\n| 0 |\n+-------------+\n\nWhen SLEEP() is the only thing invoked by a query that is interrupted,\nit returns 1 and the query itself returns no error. This statement is\ninterrupted using KILL QUERY from another session:\n\nmysql> SELECT SLEEP(1000);\n+-------------+\n| SLEEP(1000) |\n+-------------+\n| 1 |\n+-------------+\n\nWhen SLEEP() is only part of a query that is interrupted, the query\nreturns an error. This statement is interrupted using KILL QUERY from\nanother session:\n\nmysql> SELECT 1 FROM t1 WHERE SLEEP(1000);\nERROR 1317 (70100): Query execution was interrupted\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (314,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n ADD UNDOFILE \'undo_file\'\n [INITIAL_SIZE [=] initial_size]\n [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n [REDO_BUFFER_SIZE [=] redo_buffer_size]\n [NODEGROUP [=] nodegroup_id]\n [WAIT]\n [COMMENT [=] comment_text]\n ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nIn MySQL Cluster NDB 7.3 and later, you can have only one log file\ngroup per Cluster at any given time. (See Bug #16386)\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. In MySQL\nCluster NDB 7.3.2 and later, you may optionally follow either or both\nof these with a one-letter abbreviation for an order of magnitude,\nsimilar to those used in my.cnf. Generally, this is one of the letters\nM (for megabytes) or G (for gigabytes). Prior to MySQL Cluster NDB\n7.3.2, the values for these options could only be specified using\ndigits. (Bug #13116514, Bug #16104705, Bug #62858)\n\nMemory used for UNDO_BUFFER_SIZE comes from the global pool whose size\nis determined by the value of the SharedGlobalMemory data node\nconfiguration parameter. This includes any default value implied for\nthis option by the setting of the InitialLogFileGroup data node\nconfiguration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 629145600 (600 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB).\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 5.6, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine). In any case, if the\nengine is not specified as NDB or NDBCLUSTER, the CREATE LOGFILE GROUP\nstatement appears to succeed but actually fails to create the log file\ngroup, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1 \n -> ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB; \nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1 \n -> ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n -> ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of MySQL Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 5.6. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n -> FROM INFORMATION_SCHEMA.FILES\n -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA |\n+--------------------+----------------------+----------------+\n| lg_3 | 11 | CLUSTER_NODE=3 |\n| lg_3 | 11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.6/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-logfile-group.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (314,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n ADD UNDOFILE \'undo_file\'\n [INITIAL_SIZE [=] initial_size]\n [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n [REDO_BUFFER_SIZE [=] redo_buffer_size]\n [NODEGROUP [=] nodegroup_id]\n [WAIT]\n [COMMENT [=] comment_text]\n ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nIn MySQL Cluster NDB 7.3 and later, you can have only one log file\ngroup per Cluster at any given time. (See Bug #16386)\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. In MySQL\nCluster NDB 7.3.2 and later, you may optionally follow either or both\nof these with a one-letter abbreviation for an order of magnitude,\nsimilar to those used in my.cnf. Generally, this is one of the letters\nM (for megabytes) or G (for gigabytes). Prior to MySQL Cluster NDB\n7.3.2, the values for these options could only be specified using\ndigits. (Bug #13116514, Bug #16104705, Bug #62858)\n\nMemory used for UNDO_BUFFER_SIZE comes from the global pool whose size\nis determined by the value of the SharedGlobalMemory data node\nconfiguration parameter. This includes any default value implied for\nthis option by the setting of the InitialLogFileGroup data node\nconfiguration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 629145600 (600 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB).\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 5.6, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine). In any case, if the\nengine is not specified as NDB or NDBCLUSTER, the CREATE LOGFILE GROUP\nstatement appears to succeed but actually fails to create the log file\ngroup, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1\n -> ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB; \nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1\n -> ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n -> ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of MySQL Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 5.6. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n -> FROM INFORMATION_SCHEMA.FILES\n -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA |\n+--------------------+----------------------+----------------+\n| lg_3 | 11 | CLUSTER_NODE=3 |\n| lg_3 | 11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.6/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-logfile-group.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (315,6,'NULLIF','Syntax:\nNULLIF(expr1,expr2)\n\nReturns NULL if expr1 = expr2 is true, otherwise returns expr1. This is\nthe same as CASE WHEN expr1 = expr2 THEN NULL ELSE expr1 END.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/control-flow-functions.html\n\n','mysql> SELECT NULLIF(1,1);\n -> NULL\nmysql> SELECT NULLIF(1,2);\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/control-flow-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (316,3,'ROUND','Syntax:\nROUND(X), ROUND(X,D)\n\nRounds the argument X to D decimal places. The rounding algorithm\ndepends on the data type of X. D defaults to 0 if not specified. D can\nbe negative to cause D digits left of the decimal point of the value X\nto become zero.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT ROUND(-1.23);\n -> -1\nmysql> SELECT ROUND(-1.58);\n -> -2\nmysql> SELECT ROUND(1.58);\n -> 2\nmysql> SELECT ROUND(1.298, 1);\n -> 1.3\nmysql> SELECT ROUND(1.298, 0);\n -> 1\nmysql> SELECT ROUND(23.298, -1);\n -> 20\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (317,32,'TIMEDIFF','Syntax:\nTIMEDIFF(expr1,expr2)\n\nTIMEDIFF() returns expr1 − expr2 expressed as a time value. expr1 and\nexpr2 are time or date-and-time expressions, but both must be of the\nsame type.\n\nThe result returned by TIMEDIFF() is limited to the range allowed for\nTIME values. Alternatively, you can use either of the functions\nTIMESTAMPDIFF() and UNIX_TIMESTAMP(), both of which return integers.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT TIMEDIFF(\'2000:01:01 00:00:00\',\n -> \'2000:01:01 00:00:00.000001\');\n -> \'-00:00:00.000001\'\nmysql> SELECT TIMEDIFF(\'2008-12-31 23:59:59.000001\',\n -> \'2008-12-30 01:01:01.000002\');\n -> \'46:58:57.999999\'\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); @@ -426,7 +426,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (346,2,'ST_AREA','ST_Area(poly)\n\nReturns a double-precision number indicating the area of the argument,\nas measured in its spatial reference system. For arguments of dimension\n0 or 1, the result is 0.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-polygon-property-functions.html\n\n','mysql> SET @poly = \'Polygon((0 0,0 3,3 0,0 0),(1 1,1 2,2 1,1 1))\';\nmysql> SELECT ST_Area(ST_GeomFromText(@poly));\n+---------------------------------+\n| ST_Area(ST_GeomFromText(@poly)) |\n+---------------------------------+\n| 4 |\n+---------------------------------+\n\nmysql> SET @mpoly =\n -> \'MultiPolygon(((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1)))\';\nmysql> SELECT ST_Area(ST_GeomFromText(@mpoly));\n+----------------------------------+\n| ST_Area(ST_GeomFromText(@mpoly)) |\n+----------------------------------+\n| 8 |\n+----------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-polygon-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (347,13,'ENDPOINT','EndPoint(ls)\n\nST_EndPoint() and EndPoint() are synonyms. For more information, see\nthe description of ST_EndPoint().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (348,16,'COUNT','Syntax:\nCOUNT(expr)\n\nReturns a count of the number of non-NULL values of expr in the rows\nretrieved by a SELECT statement. The result is a BIGINT value.\n\nCOUNT() returns 0 if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html\n\n','mysql> SELECT student.student_name,COUNT(*)\n -> FROM student,course\n -> WHERE student.student_id=course.student_id\n -> GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (349,28,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)] \n [(col_name,...)]\n {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n SET col_name={expr | DEFAULT}, ...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)] \n [(col_name,...)]\n SELECT ...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES\nand INSERT ... SET forms of the statement insert rows based on\nexplicitly specified values. The INSERT ... SELECT form inserts rows\nselected from another table or tables. INSERT ... SELECT is discussed\nfurther in [HELP INSERT SELECT].\n\nIn MySQL 5.6.2 and later, when inserting into a partitioned table, you\ncan control which partitions and subpartitions accept new rows. The\nPARTITION option takes a comma-separated list of the names of one or\nmore partitions or subpartitions (or both) of the table. If any of the\nrows to be inserted by a given INSERT statement do not match one of the\npartitions listed, the INSERT statement fails with the error Found a\nrow not matching the given partition set. See\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html, for\nmore information and examples.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/insert.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/insert.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (349,28,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n [(col_name,...)]\n {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n SET col_name={expr | DEFAULT}, ...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n [INTO] tbl_name\n [PARTITION (partition_name,...)]\n [(col_name,...)]\n SELECT ...\n [ ON DUPLICATE KEY UPDATE\n col_name=expr\n [, col_name=expr] ... ]\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES\nand INSERT ... SET forms of the statement insert rows based on\nexplicitly specified values. The INSERT ... SELECT form inserts rows\nselected from another table or tables. INSERT ... SELECT is discussed\nfurther in [HELP INSERT SELECT].\n\nIn MySQL 5.6.2 and later, when inserting into a partitioned table, you\ncan control which partitions and subpartitions accept new rows. The\nPARTITION option takes a comma-separated list of the names of one or\nmore partitions or subpartitions (or both) of the table. If any of the\nrows to be inserted by a given INSERT statement do not match one of the\npartitions listed, the INSERT statement fails with the error Found a\nrow not matching the given partition set. See\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html, for\nmore information and examples.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/insert.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/insert.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (350,4,'MLINEFROMTEXT','MLineFromText(wkt[,srid]), MultiLineStringFromText(wkt[,srid])\n\nConstructs a MultiLineString value using its WKT representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (351,33,'GEOMCOLLFROMWKB','GeomCollFromWKB(wkb[,srid]), GeometryCollectionFromWKB(wkb[,srid])\n\nST_GeomCollFromWKB(), ST_GeometryCollectionFromWKB(),\nGeomCollFromWKB(), and GeometryCollectionFromWKB() are synonyms. For\nmore information, see the description of ST_GeomCollFromWKB().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (352,23,'TINYTEXT','TINYTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 255 (28 − 1) characters. The\neffective maximum length is less if the value contains multibyte\ncharacters. Each TINYTEXT value is stored using a 1-byte length prefix\nthat indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-type-overview.html'); @@ -438,8 +438,8 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (358,14,'GET_LOCK','Syntax:\nGET_LOCK(str,timeout)\n\nTries to obtain a lock with a name given by the string str, using a\ntimeout of timeout seconds. A negative timeout value means infinite\ntimeout. The lock is exclusive. While held by one session, other\nsessions cannot obtain a lock of the same name.\n\nReturns 1 if the lock was obtained successfully, 0 if the attempt timed\nout (for example, because another client has previously locked the\nname), or NULL if an error occurred (such as running out of memory or\nthe thread was killed with mysqladmin kill).\n\nA lock obtained with GET_LOCK() is released explicitly by executing\nRELEASE_LOCK() or implicitly when your session terminates (either\nnormally or abnormally).\n\nLocks obtained with GET_LOCK() are not released when transactions\ncommit or roll back.\n\n*Important*: The behavior of GET_LOCK() changes in MySQL 5.7. In\nconsideration of future upgrades, limit the str value to 64 characters\nor less and do not rely on subsequent calls to GET_LOCK() releasing\nprevious locks.\n\nGET_LOCK() can be used to implement application locks or to simulate\nrecord locks. Names are locked on a server-wide basis. If a name has\nbeen locked within one session, GET_LOCK() blocks any request by\nanother session for a lock with the same name. This enables clients\nthat agree on a given lock name to use the name to perform cooperative\nadvisory locking. But be aware that it also enables a client that is\nnot among the set of cooperating clients to lock a name, either\ninadvertently or deliberately, and thus prevent any of the cooperating\nclients from locking that name. One way to reduce the likelihood of\nthis is to use lock names that are database-specific or\napplication-specific. For example, use lock names of the form\ndb_name.str or app_name.str.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT GET_LOCK(\'lock1\',10);\n -> 1\nmysql> SELECT IS_FREE_LOCK(\'lock2\');\n -> 1\nmysql> SELECT GET_LOCK(\'lock2\',10);\n -> 1\nmysql> SELECT RELEASE_LOCK(\'lock2\');\n -> 1\nmysql> SELECT RELEASE_LOCK(\'lock1\');\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (359,23,'BIGINT','BIGINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA large integer. The signed range is -9223372036854775808 to\n9223372036854775807. The unsigned range is 0 to 18446744073709551615.\n\nSERIAL is an alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (360,32,'CURTIME','Syntax:\nCURTIME([fsp])\n\nReturns the current time as a value in \'HH:MM:SS\' or HHMMSS format,\ndepending on whether the function is used in a string or numeric\ncontext. The value is expressed in the current time zone.\n\nAs of MySQL 5.6.4, if the fsp argument is given to specify a fractional\nseconds precision from 0 to 6, the return value includes a fractional\nseconds part of that many digits. Before 5.6.4, any argument is\nignored.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT CURTIME();\n -> \'23:50:26\'\nmysql> SELECT CURTIME() + 0;\n -> 235026.000000\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (361,37,'ST_DIMENSION','ST_Dimension(g)\n\nReturns the inherent dimension of the geometry value g. The result can\nbe −1, 0, 1, or 2. The meaning of these values is given in\nhttp://dev.mysql.com/doc/refman/5.6/en/gis-class-geometry.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_Dimension(ST_GeomFromText(\'LineString(1 1,2 2)\'));\n+------------------------------------------------------+\n| ST_Dimension(ST_GeomFromText(\'LineString(1 1,2 2)\')) |\n+------------------------------------------------------+\n| 1 |\n+------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (362,27,'SET','Syntax:\nSET variable_assignment [, variable_assignment] ...\n\nvariable_assignment:\n user_var_name = expr\n | [GLOBAL | SESSION] system_var_name = expr\n | [@@global. | @@session. | @@]system_var_name = expr\n\nThe SET statement assigns values to different types of variables that\naffect the operation of the server or your client.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/set-statement.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/set-statement.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (361,37,'ST_DIMENSION','ST_Dimension(g)\n\nReturns the inherent dimension of the geometry value g, or NULL if the\nargument is NULL. The dimension can be −1, 0, 1, or 2. The meaning of\nthese values is given in\nhttp://dev.mysql.com/doc/refman/5.6/en/gis-class-geometry.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_Dimension(ST_GeomFromText(\'LineString(1 1,2 2)\'));\n+------------------------------------------------------+\n| ST_Dimension(ST_GeomFromText(\'LineString(1 1,2 2)\')) |\n+------------------------------------------------------+\n| 1 |\n+------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (362,27,'SET','Syntax:\nSET variable_assignment [, variable_assignment] ...\n\nvariable_assignment:\n user_var_name = expr\n | [GLOBAL | SESSION]\n system_var_name = expr\n | [@@global. | @@session. | @@]\n system_var_name = expr\n\nThe SET statement assigns values to different types of variables that\naffect the operation of the server or your client.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/set-statement.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/set-statement.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (363,3,'CONV','Syntax:\nCONV(N,from_base,to_base)\n\nConverts numbers between different number bases. Returns a string\nrepresentation of the number N, converted from base from_base to base\nto_base. Returns NULL if any argument is NULL. The argument N is\ninterpreted as an integer, but may be specified as an integer or a\nstring. The minimum base is 2 and the maximum base is 36. If from_base\nis a negative number, N is regarded as a signed number. Otherwise, N is\ntreated as unsigned. CONV() works with 64-bit precision.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT CONV(\'a\',16,2);\n -> \'1010\'\nmysql> SELECT CONV(\'6E\',18,8);\n -> \'172\'\nmysql> SELECT CONV(-17,10,-18);\n -> \'-H\'\nmysql> SELECT CONV(10+\'10\'+\'10\'+X\'0a\',10,10);\n -> \'40\'\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (364,28,'LOAD XML','Syntax:\nLOAD XML [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n [REPLACE | IGNORE]\n INTO TABLE [db_name.]tbl_name\n [CHARACTER SET charset_name]\n [ROWS IDENTIFIED BY \'\']\n [IGNORE number {LINES | ROWS}]\n [(field_name_or_user_var,...)]\n [SET col_name = expr,...]\n\nThe LOAD XML statement reads data from an XML file into a table. The\nfile_name must be given as a literal string. The tagname in the\noptional ROWS IDENTIFIED BY clause must also be given as a literal\nstring, and must be surrounded by angle brackets (< and >).\n\nLOAD XML acts as the complement of running the mysql client in XML\noutput mode (that is, starting the client with the --xml option). To\nwrite data from a table to an XML file, you can invoke the mysql client\nwith the --xml and -e options from the system shell, as shown here:\n\nshell> mysql --xml -e \'SELECT * FROM mydb.mytable\' > file.xml\n\nTo read the file back into a table, use LOAD XML INFILE. By default,\nthe element is considered to be the equivalent of a database\ntable row; this can be changed using the ROWS IDENTIFIED BY clause.\n\nThis statement supports three different XML formats:\n\no Column names as attributes and column values as attribute values:\n\n\n\no Column names as tags and column values as the content of these tags:\n\n\n value1\n value2\n\n\no Column names are the name attributes of tags, and values are\n the contents of these tags:\n\n\n value1\n value2\n\n\n This is the format used by other MySQL tools, such as mysqldump.\n\nAll three formats can be used in the same XML file; the import routine\nautomatically detects the format for each row and interprets it\ncorrectly. Tags are matched based on the tag or attribute name and the\ncolumn name.\n\nPrior to MySQL 5.6.27, LOAD XML did not handle empty XML elements in\nthe form correctly. (Bug #67542, Bug #16171518)\n\nThe following clauses work essentially the same way for LOAD XML as\nthey do for LOAD DATA:\n\no LOW_PRIORITY or CONCURRENT\n\no LOCAL\n\no REPLACE or IGNORE\n\no CHARACTER SET\n\no SET\n\nSee [HELP LOAD DATA], for more information about these clauses.\n\n(field_name_or_user_var, ...) is a comma-separated list of one or more\nXML fields or user variables. The name of a user variable used for this\npurpose must match the name of a field from the XML file, prefixed with\n@. You can use field names to select only desired fields. User\nvariables can be employed to store the corresponding field values for\nsubsequent re-use.\n\nThe IGNORE number LINES or IGNORE number ROWS clause causes the first\nnumber rows in the XML file to be skipped. It is analogous to the LOAD\nDATA statement\'s IGNORE ... LINES clause.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/load-xml.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/load-xml.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (365,15,'ASSIGN-VALUE','Syntax:\n:=\n\nAssignment operator. Causes the user variable on the left hand side of\nthe operator to take on the value to its right. The value on the right\nhand side may be a literal value, another variable storing a value, or\nany legal expression that yields a scalar value, including the result\nof a query (provided that this value is a scalar value). You can\nperform multiple assignments in the same SET statement. You can perform\nmultiple assignments in the same statement-\n\nUnlike =, the := operator is never interpreted as a comparison\noperator. This means you can use := in any valid SQL statement (not\njust in SET statements) to assign a value to a variable.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n -> 1, NULL\nmysql> SELECT @var1, @var2;\n -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n -> 1, 1\nmysql> SELECT @var1, @var2;\n -> 1, 1\n\nmysql> SELECT @var1:=COUNT(*) FROM t1;\n -> 4\nmysql> SELECT @var1;\n -> 4\n','http://dev.mysql.com/doc/refman/5.6/en/assignment-operators.html'); @@ -477,12 +477,12 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (397,3,'CRC32','Syntax:\nCRC32(expr)\n\nComputes a cyclic redundancy check value and returns a 32-bit unsigned\nvalue. The result is NULL if the argument is NULL. The argument is\nexpected to be a string and (if possible) is treated as one if it is\nnot.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT CRC32(\'MySQL\');\n -> 3259397556\nmysql> SELECT CRC32(\'mysql\');\n -> 2501908538\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (398,13,'STARTPOINT','StartPoint(ls)\n\nST_StartPoint() and StartPoint() are synonyms. For more information,\nsee the description of ST_StartPoint().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-linestring-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (399,4,'MPOLYFROMTEXT','MPolyFromText(wkt[,srid]), MultiPolygonFromText(wkt[,srid])\n\nConstructs a MultiPolygon value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (400,24,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/declare-local-variable.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/declare-local-variable.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (400,24,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttp://dev.mysql.com/doc/refman/5.6/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nFor examples of variable declarations, see\nhttp://dev.mysql.com/doc/refman/5.6/en/local-variable-scope.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/declare-local-variable.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/declare-local-variable.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (401,20,'NOT BETWEEN','Syntax:\nexpr NOT BETWEEN min AND max\n\nThis is the same as NOT (expr BETWEEN min AND max).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (402,32,'YEARWEEK','Syntax:\nYEARWEEK(date), YEARWEEK(date,mode)\n\nReturns year and week for a date. The year in the result may be\ndifferent from the year in the date argument for the first and the last\nweek of the year.\n\nThe mode argument works exactly like the mode argument to WEEK(). For\nthe single-argument syntax, a mode value of 0 is used. Unlike WEEK(),\nthe value of default_week_format does not influence YEARWEEK().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT YEARWEEK(\'1987-01-01\');\n -> 198652\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (403,16,'BIT_OR','Syntax:\nBIT_OR(expr)\n\nReturns the bitwise OR of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (404,3,'LOG10','Syntax:\nLOG10(X)\n\nReturns the base-10 logarithm of X.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT LOG10(2);\n -> 0.30102999566398\nmysql> SELECT LOG10(100);\n -> 2\nmysql> SELECT LOG10(-100);\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (405,23,'DECIMAL','DECIMAL[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nA packed "exact" fixed-point number. M is the total number of digits\n(the precision) and D is the number of digits after the decimal point\n(the scale). The decimal point and (for negative numbers) the "-" sign\nare not counted in M. If D is 0, values have no decimal point or\nfractional part. The maximum number of digits (M) for DECIMAL is 65.\nThe maximum number of supported decimals (D) is 30. If D is omitted,\nthe default is 0. If M is omitted, the default is 10.\n\nUNSIGNED, if specified, disallows negative values.\n\nAll basic calculations (+, -, *, /) with DECIMAL columns are done with\na precision of 65 digits.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (405,23,'DECIMAL','DECIMAL[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nA packed "exact" fixed-point number. M is the total number of digits\n(the precision) and D is the number of digits after the decimal point\n(the scale). The decimal point and (for negative numbers) the - sign\nare not counted in M. If D is 0, values have no decimal point or\nfractional part. The maximum number of digits (M) for DECIMAL is 65.\nThe maximum number of supported decimals (D) is 30. If D is omitted,\nthe default is 0. If M is omitted, the default is 10.\n\nUNSIGNED, if specified, disallows negative values.\n\nAll basic calculations (+, -, *, /) with DECIMAL columns are done with\na precision of 65 digits.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/numeric-type-overview.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (406,40,'CREATE FUNCTION','The CREATE FUNCTION statement is used to create stored functions and\nuser-defined functions (UDFs):\n\no For information about creating stored functions, see [HELP CREATE\n PROCEDURE].\n\no For information about creating user-defined functions, see [HELP\n CREATE FUNCTION UDF].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-function.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-function.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (407,20,'<','Syntax:\n<\n\nLess than:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','mysql> SELECT 2 < 2;\n -> 0\n','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (408,12,'MD5','Syntax:\nMD5(str)\n\nCalculates an MD5 128-bit checksum for the string. The value is\nreturned as a string of 32 hex digits, or NULL if the argument was\nNULL. The return value can, for example, be used as a hash key. See the\nnotes at the beginning of this section about storing hash values\nefficiently.\n\nThe return value is a nonbinary string in the connection character set.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html\n\n','mysql> SELECT MD5(\'testing\');\n -> \'ae2b1fca515949e5d54fb22b8ed95575\'\n','http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html'); @@ -542,7 +542,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (462,32,'CURRENT_DATE','Syntax:\nCURRENT_DATE, CURRENT_DATE()\n\nCURRENT_DATE and CURRENT_DATE() are synonyms for CURDATE().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (463,40,'TRUNCATE TABLE','Syntax:\nTRUNCATE [TABLE] tbl_name\n\nTRUNCATE TABLE empties a table completely. It requires the DROP\nprivilege.\n\nLogically, TRUNCATE TABLE is similar to a DELETE statement that deletes\nall rows, or a sequence of DROP TABLE and CREATE TABLE statements. To\nachieve high performance, it bypasses the DML method of deleting data.\nThus, it cannot be rolled back, it does not cause ON DELETE triggers to\nfire, and it cannot be performed for InnoDB tables with parent-child\nforeign key relationships.\n\nAlthough TRUNCATE TABLE is similar to DELETE, it is classified as a DDL\nstatement rather than a DML statement. It differs from DELETE in the\nfollowing ways in MySQL 5.6:\n\no Truncate operations drop and re-create the table, which is much\n faster than deleting rows one by one, particularly for large tables.\n\no Truncate operations cause an implicit commit, and so cannot be rolled\n back.\n\no Truncation operations cannot be performed if the session holds an\n active table lock.\n\no TRUNCATE TABLE fails for an InnoDB table or NDB table if there are\n any FOREIGN KEY constraints from other tables that reference the\n table. Foreign key constraints between columns of the same table are\n permitted.\n\no Truncation operations do not return a meaningful value for the number\n of deleted rows. The usual result is "0 rows affected," which should\n be interpreted as "no information."\n\no As long as the table format file tbl_name.frm is valid, the table can\n be re-created as an empty table with TRUNCATE TABLE, even if the data\n or index files have become corrupted.\n\no Any AUTO_INCREMENT value is reset to its start value. This is true\n even for MyISAM and InnoDB, which normally do not reuse sequence\n values.\n\no When used with partitioned tables, TRUNCATE TABLE preserves the\n partitioning; that is, the data and index files are dropped and\n re-created, while the partition definitions (.par) file is\n unaffected.\n\no The TRUNCATE TABLE statement does not invoke ON DELETE triggers.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/truncate-table.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/truncate-table.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (464,2,'AREA','Area(poly)\n\nST_Area() and Area() are synonyms. For more information, see the\ndescription of ST_Area().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-polygon-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-polygon-property-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (465,8,'START SLAVE','Syntax:\nSTART SLAVE [thread_types] [until_option] [connection_options]\n\nthread_types:\n [thread_type [, thread_type] ... ]\n\nthread_type: \n IO_THREAD | SQL_THREAD\n\nuntil_option:\n UNTIL { {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n | MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n | RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n | SQL_AFTER_MTS_GAPS }\n\nconnection_options: \n [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\ngtid_set:\n uuid_set [, uuid_set] ...\n | \'\'\n\nuuid_set:\n uuid:interval[:interval]...\n\nuuid:\n hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n [0-9,A-F]\n\ninterval:\n n[-n]\n\n (n >= 1) \n\nSTART SLAVE with no thread_type options starts both of the slave\nthreads. The I/O thread reads events from the master server and stores\nthem in the relay log. The SQL thread reads events from the relay log\nand executes them. START SLAVE requires the SUPER privilege.\n\nIf START SLAVE succeeds in starting the slave threads, it returns\nwithout any error. However, even in that case, it might be that the\nslave threads start and then later stop (for example, because they do\nnot manage to connect to the master or read its binary log, or some\nother problem). START SLAVE does not warn you about this. You must\ncheck the slave\'s error log for error messages generated by the slave\nthreads, or check that they are running satisfactorily with SHOW SLAVE\nSTATUS.\n\nIn MySQL 5.6.7 and later, START SLAVE causes an implicit commit of an\nongoing transaction. See\nhttp://dev.mysql.com/doc/refman/5.6/en/implicit-commit.html.\n\nBeginning with MySQL 5.6.11, gtid_next must be set to AUTOMATIC before\nissuing this statement (Bug #16062608).\n\nMySQL 5.6.4 and later supports pluggable user-password authentication\nwith START SLAVE with the USER, PASSWORD, DEFAULT_AUTH and PLUGIN_DIR\noptions, as described in the following list:\n\no USER: User name. Cannot be set to an empty or null string, or left\n unset if PASSWORD is used.\n\no PASSWORD: Password.\n\no DEFAULT_AUTH: Name of plugin; default is MySQL native authentication.\n\no PLUGIN_DIR: Location of plugin.\n\nStarting with MySQL 5.6.4, you cannot use the SQL_THREAD option when\nspecifying any of USER, PASSWORD, DEFAULT_AUTH, or PLUGIN_DIR, unless\nthe IO_THREAD option is also provided (Bug #13083642).\n\nSee\nhttp://dev.mysql.com/doc/refman/5.6/en/pluggable-authentication.html,\nfor more information.\n\nIf an insecure connection is used with any these options, the server\nissues the warning Sending passwords in plain text without SSL/TLS is\nextremely insecure.\n\nStarting with MySQL 5.6.6, START SLAVE ... UNTIL supports two\nadditional options for use with global transaction identifiers (GTIDs)\n(see http://dev.mysql.com/doc/refman/5.6/en/replication-gtids.html).\nEach of these takes a set of one or more global transaction identifiers\ngtid_set as an argument (see\nhttp://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html#\nreplication-gtids-concepts-gtid-sets, for more information).\n\nWhen no thread_type is specified, START SLAVE UNTIL SQL_BEFORE_GTIDS\ncauses the slave SQL thread to process transactions until it has\nreached the first transaction whose GTID is listed in the gtid_set.\nSTART SLAVE UNTIL SQL_AFTER_GTIDS causes the slave threads to process\nall transactions until the last transaction in the gtid_set has been\nprocessed by both threads. In other words, START SLAVE UNTIL\nSQL_BEFORE_GTIDS causes the slave SQL thread to process all\ntransactions occurring before the first GTID in the gtid_set is\nreached, and START SLAVE UNTIL SQL_AFTER_GTIDS causes the slave threads\nto handle all transactions, including those whose GTIDs are found in\ngtid_set, until each has encountered a transaction whose GTID is not\npart of the set. SQL_BEFORE_GTIDS and SQL_AFTER_GTIDS each support the\nSQL_THREAD and IO_THREAD options, although using IO_THREAD with them\ncurrently has no effect.\n\nFor example, START SLAVE SQL_THREAD UNTIL SQL_BEFORE_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56 causes the slave SQL thread\nto process all transactions originating from the master whose\nserver_uuid is 3E11FA47-71CA-11E1-9E33-C80AA9429562 until it encounters\nthe transaction having sequence number 11; it then stops without\nprocessing this transaction. In other words, all transactions up to and\nincluding the transaction with sequence number 10 are processed.\nExecuting START SLAVE SQL_THREAD UNTIL SQL_AFTER_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56, on the other hand, would\ncause the slave SQL thread to obtain all transactions just mentioned\nfrom the master, including all of the transactions having the sequence\nnumbers 11 through 56, and then to stop without processing any\nadditional transactions; that is, the transaction having sequence\nnumber 56 would be the last transaction fetched by the slave SQL\nthread.\n\nPrior to MySQL 5.6.14, SQL_AFTER_GTIDS did not stop the slave once the\nindicated transaction was completed, but waited until another GTID\nevent was received (Bug #14767986).\n\n*Note*: The SQL_BEFORE_GTIDS and SQL_AFTER_GTIDS keywords are present\nin the MySQL 5.6.5 server; however, neither of them functioned\ncorrectly as options with START SLAVE [SQL_THREAD | IO_THREAD] UNTIL in\nthat version, and are therefore supported beginning only with MySQL\n5.6.6. (Bug#13810456)\n\nSTART SLAVE UNTIL SQL_AFTER_MTS_GAPS is available in MySQL 5.6.6 or\nlater. This statement causes a multi-threaded slave\'s SQL threads to\nrun until no more gaps are found in the relay log, and then to stop.\nThis statement can take an SQL_THREAD option, but the effects of the\nstatement remain unchanged. It has no effect on the slave I/O thread\n(and cannot be used with the IO_THREAD option). START SLAVE UNTIL\nSQL_AFTER_MTS_GAPS should be used before switching the slave from\nmulti-threaded mode to single-threaded mode (that is, when resetting\nslave_parallel_workers back to 0 from a positive, nonzero value) after\nslave has failed with errors in multi-threaded mode.\n\nTo change a failed multi-threaded slave to single-threaded mode, you\ncan issue the following series of statements, in the order shown:\n\nSTART SLAVE UNTIL SQL_AFTER_MTS_GAPS;\n\nSET @@GLOBAL.slave_parallel_workers = 0;\n\nSTART SLAVE SQL_THREAD;\n\nIf you were running the failed multi-threaded slave with\nrelay_log_recovery enabled, then you must issue START SLAVE UNTIL\nSQL_AFTER_MTS_GAPS prior to executing CHANGE MASTER TO. Otherwise the\nlatter statement fails.\n\n*Note*: It is possible to view the entire text of a running START SLAVE\n... statement, including any USER or PASSWORD values used, in the\noutput of SHOW PROCESSLIST. This is also true for the text of a running\nCHANGE MASTER TO statement, including any values it employs for\nMASTER_USER or MASTER_PASSWORD.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/start-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/start-slave.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (465,8,'START SLAVE','Syntax:\nSTART SLAVE [thread_types] [until_option] [connection_options]\n\nthread_types:\n [thread_type [, thread_type] ... ]\n\nthread_type:\n IO_THREAD | SQL_THREAD\n\nuntil_option:\n UNTIL { {SQL_BEFORE_GTIDS | SQL_AFTER_GTIDS} = gtid_set\n | MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n | RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n | SQL_AFTER_MTS_GAPS }\n\nconnection_options:\n [USER=\'user_name\'] [PASSWORD=\'user_pass\'] [DEFAULT_AUTH=\'plugin_name\'] [PLUGIN_DIR=\'plugin_dir\']\n\n\ngtid_set:\n uuid_set [, uuid_set] ...\n | \'\'\n\nuuid_set:\n uuid:interval[:interval]...\n\nuuid:\n hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh\n\nh:\n [0-9,A-F]\n\ninterval:\n n[-n]\n\n (n >= 1)\n\nSTART SLAVE with no thread_type options starts both of the slave\nthreads. The I/O thread reads events from the master server and stores\nthem in the relay log. The SQL thread reads events from the relay log\nand executes them. START SLAVE requires the SUPER privilege.\n\nIf START SLAVE succeeds in starting the slave threads, it returns\nwithout any error. However, even in that case, it might be that the\nslave threads start and then later stop (for example, because they do\nnot manage to connect to the master or read its binary log, or some\nother problem). START SLAVE does not warn you about this. You must\ncheck the slave\'s error log for error messages generated by the slave\nthreads, or check that they are running satisfactorily with SHOW SLAVE\nSTATUS.\n\nIn MySQL 5.6.7 and later, START SLAVE causes an implicit commit of an\nongoing transaction. See\nhttp://dev.mysql.com/doc/refman/5.6/en/implicit-commit.html.\n\nBeginning with MySQL 5.6.11, gtid_next must be set to AUTOMATIC before\nissuing this statement (Bug #16062608).\n\nMySQL 5.6.4 and later supports pluggable user-password authentication\nwith START SLAVE with the USER, PASSWORD, DEFAULT_AUTH and PLUGIN_DIR\noptions, as described in the following list:\n\no USER: User name. Cannot be set to an empty or null string, or left\n unset if PASSWORD is used.\n\no PASSWORD: Password.\n\no DEFAULT_AUTH: Name of plugin; default is MySQL native authentication.\n\no PLUGIN_DIR: Location of plugin.\n\nStarting with MySQL 5.6.4, you cannot use the SQL_THREAD option when\nspecifying any of USER, PASSWORD, DEFAULT_AUTH, or PLUGIN_DIR, unless\nthe IO_THREAD option is also provided (Bug #13083642).\n\nSee\nhttp://dev.mysql.com/doc/refman/5.6/en/pluggable-authentication.html,\nfor more information.\n\nIf an insecure connection is used with any these options, the server\nissues the warning Sending passwords in plain text without SSL/TLS is\nextremely insecure.\n\nStarting with MySQL 5.6.6, START SLAVE ... UNTIL supports two\nadditional options for use with global transaction identifiers (GTIDs)\n(see http://dev.mysql.com/doc/refman/5.6/en/replication-gtids.html).\nEach of these takes a set of one or more global transaction identifiers\ngtid_set as an argument (see\nhttp://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html#\nreplication-gtids-concepts-gtid-sets, for more information).\n\nWhen no thread_type is specified, START SLAVE UNTIL SQL_BEFORE_GTIDS\ncauses the slave SQL thread to process transactions until it has\nreached the first transaction whose GTID is listed in the gtid_set.\nSTART SLAVE UNTIL SQL_AFTER_GTIDS causes the slave threads to process\nall transactions until the last transaction in the gtid_set has been\nprocessed by both threads. In other words, START SLAVE UNTIL\nSQL_BEFORE_GTIDS causes the slave SQL thread to process all\ntransactions occurring before the first GTID in the gtid_set is\nreached, and START SLAVE UNTIL SQL_AFTER_GTIDS causes the slave threads\nto handle all transactions, including those whose GTIDs are found in\ngtid_set, until each has encountered a transaction whose GTID is not\npart of the set. SQL_BEFORE_GTIDS and SQL_AFTER_GTIDS each support the\nSQL_THREAD and IO_THREAD options, although using IO_THREAD with them\ncurrently has no effect.\n\nFor example, START SLAVE SQL_THREAD UNTIL SQL_BEFORE_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56 causes the slave SQL thread\nto process all transactions originating from the master whose\nserver_uuid is 3E11FA47-71CA-11E1-9E33-C80AA9429562 until it encounters\nthe transaction having sequence number 11; it then stops without\nprocessing this transaction. In other words, all transactions up to and\nincluding the transaction with sequence number 10 are processed.\nExecuting START SLAVE SQL_THREAD UNTIL SQL_AFTER_GTIDS =\n3E11FA47-71CA-11E1-9E33-C80AA9429562:11-56, on the other hand, would\ncause the slave SQL thread to obtain all transactions just mentioned\nfrom the master, including all of the transactions having the sequence\nnumbers 11 through 56, and then to stop without processing any\nadditional transactions; that is, the transaction having sequence\nnumber 56 would be the last transaction fetched by the slave SQL\nthread.\n\nPrior to MySQL 5.6.14, SQL_AFTER_GTIDS did not stop the slave once the\nindicated transaction was completed, but waited until another GTID\nevent was received (Bug #14767986).\n\n*Note*: The SQL_BEFORE_GTIDS and SQL_AFTER_GTIDS keywords are present\nin the MySQL 5.6.5 server; however, neither of them functioned\ncorrectly as options with START SLAVE [SQL_THREAD | IO_THREAD] UNTIL in\nthat version, and are therefore supported beginning only with MySQL\n5.6.6. (Bug#13810456)\n\nSTART SLAVE UNTIL SQL_AFTER_MTS_GAPS is available in MySQL 5.6.6 or\nlater. This statement causes a multi-threaded slave\'s SQL threads to\nrun until no more gaps are found in the relay log, and then to stop.\nThis statement can take an SQL_THREAD option, but the effects of the\nstatement remain unchanged. It has no effect on the slave I/O thread\n(and cannot be used with the IO_THREAD option). START SLAVE UNTIL\nSQL_AFTER_MTS_GAPS should be used before switching the slave from\nmulti-threaded mode to single-threaded mode (that is, when resetting\nslave_parallel_workers back to 0 from a positive, nonzero value) after\nslave has failed with errors in multi-threaded mode.\n\nTo change a failed multi-threaded slave to single-threaded mode, you\ncan issue the following series of statements, in the order shown:\n\nSTART SLAVE UNTIL SQL_AFTER_MTS_GAPS;\n\nSET @@GLOBAL.slave_parallel_workers = 0;\n\nSTART SLAVE SQL_THREAD;\n\nIf you were running the failed multi-threaded slave with\nrelay_log_recovery enabled, then you must issue START SLAVE UNTIL\nSQL_AFTER_MTS_GAPS prior to executing CHANGE MASTER TO. Otherwise the\nlatter statement fails.\n\n*Note*: It is possible to view the entire text of a running START SLAVE\n... statement, including any USER or PASSWORD values used, in the\noutput of SHOW PROCESSLIST. This is also true for the text of a running\nCHANGE MASTER TO statement, including any values it employs for\nMASTER_USER or MASTER_PASSWORD.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/start-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/start-slave.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (466,27,'SHOW WARNINGS','Syntax:\nSHOW WARNINGS [LIMIT [offset,] row_count]\nSHOW COUNT(*) WARNINGS\n\nSHOW WARNINGS is a diagnostic statement that displays information about\nthe conditions (errors, warnings, and notes) resulting from executing a\nstatement in the current session. Warnings are generated for DML\nstatements such as INSERT, UPDATE, and LOAD DATA INFILE as well as DDL\nstatements such as CREATE TABLE and ALTER TABLE.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttp://dev.mysql.com/doc/refman/5.6/en/select.html.\n\nSHOW WARNINGS is also used following EXPLAIN EXTENDED, to display the\nextra information generated by EXPLAIN when the EXTENDED keyword is\nused. See http://dev.mysql.com/doc/refman/5.6/en/explain-extended.html.\n\nSHOW WARNINGS displays information about the conditions resulting from\nthe most recent statement in the current session that generated\nmessages. It shows nothing if the most recent statement used a table\nand generated no messages. (That is, statements that use a table but\ngenerate no messages clear the message list.) Statements that do not\nuse tables and do not generate messages have no effect on the message\nlist.\n\nThe SHOW COUNT(*) WARNINGS diagnostic statement displays the total\nnumber of errors, warnings, and notes. You can also retrieve this\nnumber from the warning_count system variable:\n\nSHOW COUNT(*) WARNINGS;\nSELECT @@warning_count;\n\nA related diagnostic statement, SHOW ERRORS, shows only error\nconditions (it excludes warnings and notes), and SHOW COUNT(*) ERRORS\nstatement displays the total number of errors. See [HELP SHOW ERRORS].\nGET DIAGNOSTICS can be used to examine information for individual\nconditions. See [HELP GET DIAGNOSTICS].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-warnings.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-warnings.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (467,4,'ST_LINEFROMTEXT','ST_LineFromText(wkt[,srid]), ST_LineStringFromText(wkt[,srid])\n\nConstructs a LineString value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (468,10,'DROP USER','Syntax:\nDROP USER user [, user] ...\n\nThe DROP USER statement removes one or more MySQL accounts and their\nprivileges. It removes privilege rows for the account from all grant\ntables. An error occurs for accounts that do not exist.\n\nTo use DROP USER, you must have the global CREATE USER privilege or the\nDELETE privilege for the mysql database. When the read_only system\nvariable is enabled, DROP USER additionally requires the SUPER\nprivilege.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.6/en/account-names.html. For example:\n\nDROP USER \'jeffrey\'@\'localhost\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/drop-user.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/drop-user.html'); @@ -570,7 +570,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (490,16,'GROUP_CONCAT','Syntax:\nGROUP_CONCAT(expr)\n\nThis function returns a string result with the concatenated non-NULL\nvalues from a group. It returns NULL if there are no non-NULL values.\nThe full syntax is as follows:\n\nGROUP_CONCAT([DISTINCT] expr [,expr ...]\n [ORDER BY {unsigned_integer | col_name | expr}\n [ASC | DESC] [,col_name ...]]\n [SEPARATOR str_val])\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html\n\n','mysql> SELECT student_name,\n -> GROUP_CONCAT(test_score)\n -> FROM student\n -> GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.6/en/group-by-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (491,17,'BENCHMARK','Syntax:\nBENCHMARK(count,expr)\n\nThe BENCHMARK() function executes the expression expr repeatedly count\ntimes. It may be used to time how quickly MySQL processes the\nexpression. The result value is always 0. The intended use is from\nwithin the mysql client, which reports query execution times:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/information-functions.html\n\n','mysql> SELECT BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\'));\n+----------------------------------------------+\n| BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\')) |\n+----------------------------------------------+\n| 0 |\n+----------------------------------------------+\n1 row in set (4.74 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/information-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (492,38,'FROM_BASE64','Syntax:\nFROM_BASE64(str)\n\nTakes a string encoded with the base-64 encoded rules used by\nTO_BASE64() and returns the decoded result as a binary string. The\nresult is NULL if the argument is NULL or not a valid base-64 string.\nSee the description of TO_BASE64() for details about the encoding and\ndecoding rules.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT TO_BASE64(\'abc\'), FROM_BASE64(TO_BASE64(\'abc\'));\n -> \'JWJj\', \'abc\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (493,27,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The statement has these variants:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE {NDB | NDBCLUSTER} STATUS\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttp://dev.mysql.com/doc/refman/5.6/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex and rw-lock statistics.\n\n*Note*: Most SHOW ENGINE INNODB MUTEX output is removed in 5.6.14. SHOW\nENGINE INNODB MUTEX output is removed entirely in MySQL 5.7.2. InnoDB\nmutexes can be monitored using Performance Schema tables. For an\nexample, see\nhttp://dev.mysql.com/doc/refman/5.6/en/monitor-innodb-mutex-waits-perfo\nrmance-schema.html.\n\no Type\n\n Always InnoDB.\n\no Name\n\n The source file where the mutex is implemented, and the line number\n in the file where the mutex is created. The line number is specific\n to your version of MySQL.\n\no Status\n\n The mutex status. This field displays several values if WITH_DEBUG\n was defined at MySQL compilation time. If WITH_DEBUG was not defined,\n the statement displays only the os_waits value. In the latter case\n (without WITH_DEBUG), the information on which the output is based is\n insufficient to distinguish regular mutexes and mutexes that protect\n rw-locks (which permit multiple readers or a single writer).\n Consequently, the output may appear to contain multiple rows for the\n same mutex.\n\n o count indicates how many times the mutex was requested.\n\n o spin_waits indicates how many times the spinlock had to run.\n\n o spin_rounds indicates the number of spinlock rounds. (spin_rounds\n divided by spin_waits provides the average round count.)\n\n o os_waits indicates the number of operating system waits. This\n occurs when the spinlock did not work (the mutex was not locked\n during the spinlock and it was necessary to yield to the operating\n system and wait).\n\n o os_yields indicates the number of times a thread trying to lock a\n mutex gave up its timeslice and yielded to the operating system (on\n the presumption that permitting other threads to run will free the\n mutex so that it can be locked).\n\n o os_wait_times indicates the amount of time (in ms) spent in\n operating system waits. In MySQL 5.6 timing is disabled and this\n value is always 0.\n\nSHOW ENGINE INNODB MUTEX skips the mutexes and rw-locks of buffer pool\nblocks, as the amount of output can be overwhelming on systems with a\nlarge buffer pool. (There is one mutex and one rw-lock in each 16K\nbuffer pool block, and there are 65,536 blocks per gigabyte.) SHOW\nENGINE INNODB MUTEX also does not list any mutexes or rw-locks that\nhave never been waited on (os_waits=0). Thus, SHOW ENGINE INNODB MUTEX\nonly displays information about mutexes and rw-locks outside of the\nbuffer pool that have caused at least one OS-level wait.\n\nSHOW ENGINE INNODB MUTEX information can be used to diagnose system\nproblems. For example, large values of spin_waits and spin_rounds may\nindicate scalability problems.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n Type: performance_schema\n Name: events_waits_history.row_size\nStatus: 76\n*************************** 4. row ***************************\n Type: performance_schema\n Name: events_waits_history.row_count\nStatus: 10000\n*************************** 5. row ***************************\n Type: performance_schema\n Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n Type: performance_schema\n Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n parentheses. Examples: (pfs_cond_class).row_size,\n (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n performance_schema database is named after the table, without\n parentheses. Examples: events_waits_history.row_size,\n mutex_instances.row_count.\n\no A value that applies to the Performance Schema as a whole begins with\n performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no row_size is the size of the internal record used by the\n implementation, such as the size of a row in a table. row_size values\n cannot be changed.\n\no row_count is the number of internal records, such as the number of\n rows in a table. row_count values can be changed using Performance\n Schema configuration options.\n\no For a table, tbl_name.memory is the product of row_size and\n row_count. For the Performance Schema as a whole,\n performance_schema.memory is the sum of all the memory used (the sum\n of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.row_count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example,\nevents_waits_history.row_count corresponds to\nperformance_schema_events_waits_history_size (the number of rows per\nthread) multiplied by performance_schema_max_thread_instances ( the\nnumber of threads).\n\nSHOW ENGINE NDB STATUS If the server has the NDB storage engine\nenabled, SHOW ENGINE NDB STATUS displays cluster status information\nsuch as the number of connected data nodes, the cluster connectstring,\nand cluster binary log epochs, as well as counts of various Cluster API\nobjects created by the MySQL Server when connected to the cluster.\nSample output from this statement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type | Name | Status |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection | cluster_node_id=7,\n connected_host=192.168.0.103, connected_port=1186, number_of_data_nodes=4,\n number_of_ready_data_nodes=3, connect_count=0 |\n| ndbcluster | NdbTransaction | created=6, free=0, sizeof=212 |\n| ndbcluster | NdbOperation | created=8, free=8, sizeof=660 |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744 |\n| ndbcluster | NdbIndexOperation | created=0, free=0, sizeof=664 |\n| ndbcluster | NdbRecAttr | created=1285, free=1285, sizeof=60 |\n| ndbcluster | NdbApiSignal | created=16, free=16, sizeof=136 |\n| ndbcluster | NdbLabel | created=0, free=0, sizeof=196 |\n| ndbcluster | NdbBranch | created=0, free=0, sizeof=24 |\n| ndbcluster | NdbSubroutine | created=0, free=0, sizeof=68 |\n| ndbcluster | NdbCall | created=0, free=0, sizeof=16 |\n| ndbcluster | NdbBlob | created=1, free=1, sizeof=264 |\n| ndbcluster | NdbReceiver | created=4, free=0, sizeof=68 |\n| ndbcluster | binlog | latest_epoch=155467, latest_trans_epoch=148126,\n latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n latest_applied_binlog_epoch=0 |\n+------------+-----------------------+--------------------------------------------------+\n\nThe rows with connection and binlog in the Name column were added to\nthe output of this statement in MySQL 5.1. The Status column in each of\nthese rows provides information about the MySQL server\'s connection to\nthe cluster and about the cluster binary log\'s status, respectively.\nThe Status information is in the form of comma-delimited set of\nname/value pairs.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-engine.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-engine.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (493,27,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The statement has these variants:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE {NDB | NDBCLUSTER} STATUS\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttp://dev.mysql.com/doc/refman/5.6/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex and rw-lock statistics.\n\n*Note*: Most SHOW ENGINE INNODB MUTEX output is removed in 5.6.14. SHOW\nENGINE INNODB MUTEX output is removed entirely in MySQL 5.7.2. InnoDB\nmutexes can be monitored using Performance Schema tables. For an\nexample, see\nhttp://dev.mysql.com/doc/refman/5.6/en/monitor-innodb-mutex-waits-perfo\nrmance-schema.html.\n\no Type\n\n Always InnoDB.\n\no Name\n\n The source file where the mutex is implemented, and the line number\n in the file where the mutex is created. The line number is specific\n to your version of MySQL.\n\no Status\n\n The mutex status. This field displays several values if WITH_DEBUG\n was defined at MySQL compilation time. If WITH_DEBUG was not defined,\n the statement displays only the os_waits value. In the latter case\n (without WITH_DEBUG), the information on which the output is based is\n insufficient to distinguish regular mutexes and mutexes that protect\n rw-locks (which permit multiple readers or a single writer).\n Consequently, the output may appear to contain multiple rows for the\n same mutex.\n\n o count indicates how many times the mutex was requested.\n\n o spin_waits indicates how many times the spinlock had to run.\n\n o spin_rounds indicates the number of spinlock rounds. (spin_rounds\n divided by spin_waits provides the average round count.)\n\n o os_waits indicates the number of operating system waits. This\n occurs when the spinlock did not work (the mutex was not locked\n during the spinlock and it was necessary to yield to the operating\n system and wait).\n\n o os_yields indicates the number of times a thread trying to lock a\n mutex gave up its timeslice and yielded to the operating system (on\n the presumption that permitting other threads to run will free the\n mutex so that it can be locked).\n\n o os_wait_times indicates the amount of time (in ms) spent in\n operating system waits. In MySQL 5.6 timing is disabled and this\n value is always 0.\n\nSHOW ENGINE INNODB MUTEX skips the mutexes and rw-locks of buffer pool\nblocks, as the amount of output can be overwhelming on systems with a\nlarge buffer pool. (There is one mutex and one rw-lock in each 16K\nbuffer pool block, and there are 65,536 blocks per gigabyte.) SHOW\nENGINE INNODB MUTEX also does not list any mutexes or rw-locks that\nhave never been waited on (os_waits=0). Thus, SHOW ENGINE INNODB MUTEX\nonly displays information about mutexes and rw-locks outside of the\nbuffer pool that have caused at least one OS-level wait.\n\nSHOW ENGINE INNODB MUTEX information can be used to diagnose system\nproblems. For example, large values of spin_waits and spin_rounds may\nindicate scalability problems.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n Type: performance_schema\n Name: events_waits_history.row_size\nStatus: 76\n*************************** 4. row ***************************\n Type: performance_schema\n Name: events_waits_history.row_count\nStatus: 10000\n*************************** 5. row ***************************\n Type: performance_schema\n Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n Type: performance_schema\n Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n parentheses. Examples: (pfs_cond_class).row_size,\n (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n performance_schema database is named after the table, without\n parentheses. Examples: events_waits_history.row_size,\n mutex_instances.row_count.\n\no A value that applies to the Performance Schema as a whole begins with\n performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no row_size is the size of the internal record used by the\n implementation, such as the size of a row in a table. row_size values\n cannot be changed.\n\no row_count is the number of internal records, such as the number of\n rows in a table. row_count values can be changed using Performance\n Schema configuration options.\n\no For a table, tbl_name.memory is the product of row_size and\n row_count. For the Performance Schema as a whole,\n performance_schema.memory is the sum of all the memory used (the sum\n of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.row_count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example,\nevents_waits_history.row_count corresponds to\nperformance_schema_events_waits_history_size (the number of rows per\nthread) multiplied by performance_schema_max_thread_instances ( the\nnumber of threads).\n\nSHOW ENGINE NDB STATUS If the server has the NDB storage engine\nenabled, SHOW ENGINE NDB STATUS displays cluster status information\nsuch as the number of connected data nodes, the cluster connectstring,\nand cluster binary log epochs, as well as counts of various Cluster API\nobjects created by the MySQL Server when connected to the cluster.\nSample output from this statement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type | Name | Status |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection | cluster_node_id=7,\n connected_host=192.168.0.103, connected_port=1186, number_of_data_nodes=4,\n number_of_ready_data_nodes=3, connect_count=0 |\n| ndbcluster | NdbTransaction | created=6, free=0, sizeof=212 |\n| ndbcluster | NdbOperation | created=8, free=8, sizeof=660 |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744 |\n| ndbcluster | NdbIndexOperation | created=0, free=0, sizeof=664 |\n| ndbcluster | NdbRecAttr | created=1285, free=1285, sizeof=60 |\n| ndbcluster | NdbApiSignal | created=16, free=16, sizeof=136 |\n| ndbcluster | NdbLabel | created=0, free=0, sizeof=196 |\n| ndbcluster | NdbBranch | created=0, free=0, sizeof=24 |\n| ndbcluster | NdbSubroutine | created=0, free=0, sizeof=68 |\n| ndbcluster | NdbCall | created=0, free=0, sizeof=16 |\n| ndbcluster | NdbBlob | created=1, free=1, sizeof=264 |\n| ndbcluster | NdbReceiver | created=4, free=0, sizeof=68 |\n| ndbcluster | binlog | latest_epoch=155467, latest_trans_epoch=148126,\n latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n latest_applied_binlog_epoch=0 |\n+------------+-----------------------+--------------------------------------------------+\n\nThe Status column in each of these rows provides information about the\nMySQL server\'s connection to the cluster and about the cluster binary\nlog\'s status, respectively. The Status information is in the form of\ncomma-delimited set of name/value pairs.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-engine.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-engine.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (494,14,'NAME_CONST','Syntax:\nNAME_CONST(name,value)\n\nReturns the given value. When used to produce a result set column,\nNAME_CONST() causes the column to have the given name. The arguments\nshould be constants.\n\nmysql> SELECT NAME_CONST(\'myname\', 14);\n+--------+\n| myname |\n+--------+\n| 14 |\n+--------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (495,14,'RELEASE_LOCK','Syntax:\nRELEASE_LOCK(str)\n\nReleases the lock named by the string str that was obtained with\nGET_LOCK(). Returns 1 if the lock was released, 0 if the lock was not\nestablished by this thread (in which case the lock is not released),\nand NULL if the named lock did not exist. The lock does not exist if it\nwas never obtained by a call to GET_LOCK() or if it has previously been\nreleased.\n\nThe DO statement is convenient to use with RELEASE_LOCK(). See [HELP\nDO].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (496,32,'WEEKDAY','Syntax:\nWEEKDAY(date)\n\nReturns the weekday index for date (0 = Monday, 1 = Tuesday, ... 6 =\nSunday).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT WEEKDAY(\'2008-02-03 22:23:00\');\n -> 6\nmysql> SELECT WEEKDAY(\'2007-11-06\');\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); @@ -588,7 +588,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (508,38,'POSITION','Syntax:\nPOSITION(substr IN str)\n\nPOSITION(substr IN str) is a synonym for LOCATE(substr,str).\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (509,14,'IS_USED_LOCK','Syntax:\nIS_USED_LOCK(str)\n\nChecks whether the lock named str is in use (that is, locked). If so,\nit returns the connection identifier of the client session that holds\nthe lock. Otherwise, it returns NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (510,4,'POLYFROMTEXT','PolyFromText(wkt[,srid]), PolygonFromText(wkt[,srid])\n\nST_PolyFromText(), ST_PolygonFromText(), PolyFromText(), and\nPolygonFromText() are synonyms. For more information, see the\ndescription of ST_PolyFromText().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkt-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (511,37,'ST_SRID','ST_SRID(g)\n\nReturns an integer indicating the Spatial Reference System ID for the\ngeometry value g.\n\nIn MySQL, the SRID value is just an integer associated with the\ngeometry value. All calculations are done assuming Euclidean (planar)\ngeometry.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_SRID(ST_GeomFromText(\'LineString(1 1,2 2)\',101));\n+-----------------------------------------------------+\n| ST_SRID(ST_GeomFromText(\'LineString(1 1,2 2)\',101)) |\n+-----------------------------------------------------+\n| 101 |\n+-----------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (511,37,'ST_SRID','ST_SRID(g)\n\nReturns an integer indicating the Spatial Reference System ID for the\ngeometry value g, or NULL if the argument is NULL.\n\nIn MySQL, the SRID value is just an integer associated with the\ngeometry value. All calculations are done assuming Euclidean (planar)\ngeometry.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','mysql> SELECT ST_SRID(ST_GeomFromText(\'LineString(1 1,2 2)\',101));\n+-----------------------------------------------------+\n| ST_SRID(ST_GeomFromText(\'LineString(1 1,2 2)\',101)) |\n+-----------------------------------------------------+\n| 101 |\n+-----------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (512,10,'ALTER USER','Syntax:\nALTER USER user_specification [, user_specification] ...\n\nuser_specification:\n user PASSWORD EXPIRE\n\nThe ALTER USER statement modifies MySQL accounts. An error occurs if\nyou try to modify a nonexistent account.\n\nTo use ALTER USER, you must have the global CREATE USER privilege or\nthe UPDATE privilege for the mysql database. When the read_only system\nvariable is enabled, ALTER USER additionally requires the SUPER\nprivilege.\n\n*Warning*: ALTER USER was added in MySQL 5.6.6. However, in 5.6.6,\nALTER USER also sets the Password column to the empty string, so do not\nuse this statement until 5.6.7.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.6/en/account-names.html. If you\nspecify only the user name part of the account name, a host name part\nof \'%\' is used. It is also possible to specify CURRENT_USER or\nCURRENT_USER() to refer to the account associated with the current\nsession.\n\nFor each account, ALTER USER expires its password. For example:\n\nALTER USER \'jeffrey\'@\'localhost\' PASSWORD EXPIRE;\n\nPassword expiration for an account affects the corresponding row of the\nmysql.user table: The server sets the password_expired column to \'Y\'.\n\nA client session operates in restricted mode if the account password\nhas been expired. In restricted mode, operations performed within the\nsession result in an error until the user establishes a new account\npassword:\n\nmysql> SELECT 1;\nERROR 1820 (HY000): You must SET PASSWORD before executing this statement\n\nmysql> SET PASSWORD = PASSWORD(\'new_password\');\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SELECT 1;\n+---+\n| 1 |\n+---+\n| 1 |\n+---+\n1 row in set (0.00 sec)\n\nAs of MySQL 5.6.8, this restricted mode of operation permits SET\nstatements, which is useful if the account password has a hashing\nformat that requires old_passwords to be set to a value different from\nits default before using SET PASSWORD.\n\nIt is possible for an administrative user to reset the account\npassword, but any existing sessions for the account remain restricted.\nA client using the account must disconnect and reconnect before\nstatements can be executed successfully.\n\n*Note*: It is possible to "reset" a password by setting it to its\ncurrent value. As a matter of good policy, it is preferable to choose a\ndifferent password.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/alter-user.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/alter-user.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (513,12,'DES_ENCRYPT','Syntax:\nDES_ENCRYPT(str[,{key_num|key_str}])\n\nEncrypts the string with the given key using the Triple-DES algorithm.\n\nThis function works only if MySQL has been configured with SSL support.\nSee http://dev.mysql.com/doc/refman/5.6/en/secure-connections.html.\n\nThe encryption key to use is chosen based on the second argument to\nDES_ENCRYPT(), if one was given. With no argument, the first key from\nthe DES key file is used. With a key_num argument, the given key number\n(0 to 9) from the DES key file is used. With a key_str argument, the\ngiven key string is used to encrypt str.\n\nThe key file can be specified with the --des-key-file server option.\n\nThe return string is a binary string where the first character is\nCHAR(128 | key_num). If an error occurs, DES_ENCRYPT() returns NULL.\n\nThe 128 is added to make it easier to recognize an encrypted key. If\nyou use a string key, key_num is 127.\n\nThe string length for the result is given by this formula:\n\nnew_len = orig_len + (8 - (orig_len % 8)) + 1\n\nEach line in the DES key file has the following format:\n\nkey_num des_key_str\n\nEach key_num value must be a number in the range from 0 to 9. Lines in\nthe file may be in any order. des_key_str is the string that is used to\nencrypt the message. There should be at least one space between the\nnumber and the key. The first key is the default key that is used if\nyou do not specify any key argument to DES_ENCRYPT().\n\nYou can tell MySQL to read new key values from the key file with the\nFLUSH DES_KEY_FILE statement. This requires the RELOAD privilege.\n\nOne benefit of having a set of default keys is that it gives\napplications a way to check for the existence of encrypted column\nvalues, without giving the end user the right to decrypt those values.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html\n\n','mysql> SELECT customer_address FROM customer_table \n > WHERE crypted_credit_card = DES_ENCRYPT(\'credit_card_number\');\n','http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (514,3,'CEIL','Syntax:\nCEIL(X)\n\nCEIL() is a synonym for CEILING().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); @@ -604,7 +604,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (524,14,'UUID_SHORT','Syntax:\nUUID_SHORT()\n\nReturns a "short" universal identifier as a 64-bit unsigned integer.\nValues returned by UUID_SHORT() differ from the string-format 128-bit\nidentifiers returned by the UUID() function and have different\nuniqueness properties. The value of UUID_SHORT() is guaranteed to be\nunique if the following conditions hold:\n\no The server_id value of the current server is between 0 and 255 and is\n unique among your set of master and slave servers\n\no You do not set back the system time for your server host between\n mysqld restarts\n\no You invoke UUID_SHORT() on average fewer than 16 million times per\n second between mysqld restarts\n\nThe UUID_SHORT() return value is constructed this way:\n\n (server_id & 255) << 56\n+ (server_startup_time_in_seconds << 24)\n+ incremented_variable++;\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID_SHORT();\n -> 92395783831158784\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (525,32,'DATEDIFF','Syntax:\nDATEDIFF(expr1,expr2)\n\nDATEDIFF() returns expr1 − expr2 expressed as a value in days from\none date to the other. expr1 and expr2 are date or date-and-time\nexpressions. Only the date parts of the values are used in the\ncalculation.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT DATEDIFF(\'2007-12-31 23:59:59\',\'2007-12-30\');\n -> 1\nmysql> SELECT DATEDIFF(\'2010-11-30 23:59:59\',\'2010-12-31\');\n -> -31\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (526,40,'DROP PROCEDURE','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThis statement is used to drop a stored procedure or function. That is,\nthe specified routine is removed from the server. You must have the\nALTER ROUTINE privilege for the routine. (If the\nautomatic_sp_privileges system variable is enabled, that privilege and\nEXECUTE are granted automatically to the routine creator when the\nroutine is created and dropped from the creator when the routine is\ndropped. See\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-routines-privileges.html.\n)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/drop-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/drop-procedure.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (527,5,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin table.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see\nhttp://dev.mysql.com/doc/refman/5.6/en/plugin-data-structures.html).\nPlugin names are not case sensitive. For maximal compatibility, plugin\nnames should be limited to ASCII letters, digits, and underscore\nbecause they are used in C source files, shell command lines, M4 and\nBourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a chance to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\ntable. At server startup, the server loads and initializes any plugin\nthat is listed in the mysql.plugin table. This means that a plugin is\ninstalled with INSTALL PLUGIN only once, not every time the server\nstarts. Plugin loading at startup does not occur if the server is\nstarted with the --skip-grant-tables option.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/install-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/install-plugin.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (527,5,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin system table.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see\nhttp://dev.mysql.com/doc/refman/5.6/en/plugin-data-structures.html).\nPlugin names are not case sensitive. For maximal compatibility, plugin\nnames should be limited to ASCII letters, digits, and underscore\nbecause they are used in C source files, shell command lines, M4 and\nBourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a chance to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\ntable. At server startup, the server loads and initializes any plugin\nthat is listed in the mysql.plugin table. This means that a plugin is\ninstalled with INSTALL PLUGIN only once, not every time the server\nstarts. Plugin loading at startup does not occur if the server is\nstarted with the --skip-grant-tables option.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/install-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/install-plugin.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (528,28,'LOAD DATA','Syntax:\nLOAD DATA [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n [REPLACE | IGNORE]\n INTO TABLE tbl_name\n [PARTITION (partition_name,...)]\n [CHARACTER SET charset_name]\n [{FIELDS | COLUMNS}\n [TERMINATED BY \'string\']\n [[OPTIONALLY] ENCLOSED BY \'char\']\n [ESCAPED BY \'char\']\n ]\n [LINES\n [STARTING BY \'string\']\n [TERMINATED BY \'string\']\n ]\n [IGNORE number {LINES | ROWS}]\n [(col_name_or_user_var,...)]\n [SET col_name = expr,...]\n\nThe LOAD DATA INFILE statement reads rows from a text file into a table\nat a very high speed. LOAD DATA INFILE is the complement of SELECT ...\nINTO OUTFILE. (See\nhttp://dev.mysql.com/doc/refman/5.6/en/select-into.html.) To write data\nfrom a table to a file, use SELECT ... INTO OUTFILE. To read the file\nback into a table, use LOAD DATA INFILE. The syntax of the FIELDS and\nLINES clauses is the same for both statements. Both clauses are\noptional, but FIELDS must precede LINES if both are specified.\n\nYou can also load data files by using the mysqlimport utility; it\noperates by sending a LOAD DATA INFILE statement to the server. The\n--local option causes mysqlimport to read data files from the client\nhost. You can specify the --compress option to get better performance\nover slow networks if the client and server support the compressed\nprotocol. See http://dev.mysql.com/doc/refman/5.6/en/mysqlimport.html.\n\nFor more information about the efficiency of INSERT versus LOAD DATA\nINFILE and speeding up LOAD DATA INFILE, see\nhttp://dev.mysql.com/doc/refman/5.6/en/insert-speed.html.\n\nThe file name must be given as a literal string. On Windows, specify\nbackslashes in path names as forward slashes or doubled backslashes.\nThe character_set_filesystem system variable controls the\ninterpretation of the file name.\n\nIn MySQL 5.6.2 and later, LOAD DATA supports explicit partition\nselection using the PARTITION option with a comma-separated list of\nmore or more names of partitions, subpartitions, or both. When this\noption is used, if any rows from the file cannot be inserted into any\nof the partitions or subpartitions named in the list, the statement\nfails with the error Found a row not matching the given partition set.\nFor more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-selection.html.\n\nFor partitioned tables using storage engines that employ table locks,\nsuch as MyISAM, LOAD DATA cannot prune any partition locks. This does\nnot apply to tables using storage engines which employ row-level\nlocking, such as InnoDB. For more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/partitioning-limitations-locking\n.html.\n\nThe server uses the character set indicated by the\ncharacter_set_database system variable to interpret the information in\nthe file. SET NAMES and the setting of character_set_client do not\naffect interpretation of input. If the contents of the input file use a\ncharacter set that differs from the default, it is usually preferable\nto specify the character set of the file by using the CHARACTER SET\nclause. A character set of binary specifies "no conversion."\n\nLOAD DATA INFILE interprets all fields in the file as having the same\ncharacter set, regardless of the data types of the columns into which\nfield values are loaded. For proper interpretation of file contents,\nyou must ensure that it was written with the correct character set. For\nexample, if you write a data file with mysqldump -T or by issuing a\nSELECT ... INTO OUTFILE statement in mysql, be sure to use a\n--default-character-set option so that output is written in the\ncharacter set to be used when the file is loaded with LOAD DATA INFILE.\n\n*Note*: It is not possible to load data files that use the ucs2, utf16,\nutf16le, or utf32 character set.\n\nIf you use LOW_PRIORITY, execution of the LOAD DATA statement is\ndelayed until no other clients are reading from the table. This affects\nonly storage engines that use only table-level locking (such as MyISAM,\nMEMORY, and MERGE).\n\nIf you specify CONCURRENT with a MyISAM table that satisfies the\ncondition for concurrent inserts (that is, it contains no free blocks\nin the middle), other threads can retrieve data from the table while\nLOAD DATA is executing. This option affects the performance of LOAD\nDATA a bit, even if no other thread is using the table at the same\ntime.\n\nWith row-based replication, CONCURRENT is replicated regardless of\nMySQL version. With statement-based replication CONCURRENT is not\nreplicated prior to MySQL 5.5.1 (see Bug #34628). For more information,\nsee\nhttp://dev.mysql.com/doc/refman/5.6/en/replication-features-load-data.h\ntml.\n\nThe LOCAL keyword affects expected location of the file and error\nhandling, as described later. LOCAL works only if your server and your\nclient both have been configured to permit it. For example, if mysqld\nwas started with --local-infile=0, LOCAL does not work. See\nhttp://dev.mysql.com/doc/refman/5.6/en/load-data-local.html.\n\nThe LOCAL keyword affects where the file is expected to be found:\n\no If LOCAL is specified, the file is read by the client program on the\n client host and sent to the server. The file can be given as a full\n path name to specify its exact location. If given as a relative path\n name, the name is interpreted relative to the directory in which the\n client program was started.\n\n When using LOCAL with LOAD DATA, a copy of the file is created in the\n server\'s temporary directory. This is not the directory determined by\n the value of tmpdir or slave_load_tmpdir, but rather the operating\n system\'s temporary directory, and is not configurable in the MySQL\n Server. (Typically the system temporary directory is /tmp on Linux\n systems and C:\\WINDOWS\\TEMP on Windows.) Lack of sufficient space for\n the copy in this directory can cause the LOAD DATA LOCAL statement to\n fail.\n\no If LOCAL is not specified, the file must be located on the server\n host and is read directly by the server. The server uses the\n following rules to locate the file:\n\n o If the file name is an absolute path name, the server uses it as\n given.\n\n o If the file name is a relative path name with one or more leading\n components, the server searches for the file relative to the\n server\'s data directory.\n\n o If a file name with no leading components is given, the server\n looks for the file in the database directory of the default\n database.\n\nIn the non-LOCAL case, these rules mean that a file named as\n./myfile.txt is read from the server\'s data directory, whereas the file\nnamed as myfile.txt is read from the database directory of the default\ndatabase. For example, if db1 is the default database, the following\nLOAD DATA statement reads the file data.txt from the database directory\nfor db1, even though the statement explicitly loads the file into a\ntable in the db2 database:\n\nLOAD DATA INFILE \'data.txt\' INTO TABLE db2.my_table;\n\nFor security reasons, when reading text files located on the server,\nthe files must either reside in the database directory or be readable\nby the user account used to run the server. Also, to use LOAD DATA\nINFILE on server files, you must have the FILE privilege. See\nhttp://dev.mysql.com/doc/refman/5.6/en/privileges-provided.html. For\nnon-LOCAL load operations, if the secure_file_priv system variable is\nset to a nonempty directory name, the file to be loaded must be located\nin that directory.\n\nUsing LOCAL is a bit slower than letting the server access the files\ndirectly, because the contents of the file must be sent over the\nconnection by the client to the server. On the other hand, you do not\nneed the FILE privilege to load local files.\n\nLOCAL also affects error handling:\n\no With LOAD DATA INFILE, data-interpretation and duplicate-key errors\n terminate the operation.\n\no With LOAD DATA LOCAL INFILE, data-interpretation and duplicate-key\n errors become warnings and the operation continues because the server\n has no way to stop transmission of the file in the middle of the\n operation. For duplicate-key errors, this is the same as if IGNORE is\n specified. IGNORE is explained further later in this section.\n\nThe REPLACE and IGNORE keywords control handling of input rows that\nduplicate existing rows on unique key values:\n\no If you specify REPLACE, input rows replace existing rows. In other\n words, rows that have the same value for a primary key or unique\n index as an existing row. See [HELP REPLACE].\n\no If you specify IGNORE, rows that duplicate an existing row on a\n unique key value are discarded.\n\no If you do not specify either option, the behavior depends on whether\n the LOCAL keyword is specified. Without LOCAL, an error occurs when a\n duplicate key value is found, and the rest of the text file is\n ignored. With LOCAL, the default behavior is the same as if IGNORE is\n specified; this is because the server has no way to stop transmission\n of the file in the middle of the operation.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/load-data.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/load-data.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (529,24,'DECLARE CURSOR','Syntax:\nDECLARE cursor_name CURSOR FOR select_statement\n\nThis statement declares a cursor and associates it with a SELECT\nstatement that retrieves the rows to be traversed by the cursor. To\nfetch the rows later, use a FETCH statement. The number of columns\nretrieved by the SELECT statement must match the number of output\nvariables specified in the FETCH statement.\n\nThe SELECT statement cannot have an INTO clause.\n\nCursor declarations must appear before handler declarations and after\nvariable and condition declarations.\n\nA stored program may contain multiple cursor declarations, but each\ncursor declared in a given block must have a unique name. For an\nexample, see http://dev.mysql.com/doc/refman/5.6/en/cursors.html.\n\nFor information available through SHOW statements, it is possible in\nmany cases to obtain equivalent information by using a cursor with an\nINFORMATION_SCHEMA table.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/declare-cursor.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/declare-cursor.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (530,32,'LOCALTIME','Syntax:\nLOCALTIME, LOCALTIME([fsp])\n\nLOCALTIME and LOCALTIME() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); @@ -622,14 +622,14 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (542,32,'UTC_TIMESTAMP','Syntax:\nUTC_TIMESTAMP, UTC_TIMESTAMP([fsp])\n\nReturns the current UTC date and time as a value in \'YYYY-MM-DD\nHH:MM:SS\' or YYYYMMDDHHMMSS format, depending on whether the function\nis used in a string or numeric context.\n\nAs of MySQL 5.6.4, if the fsp argument is given to specify a fractional\nseconds precision from 0 to 6, the return value includes a fractional\nseconds part of that many digits. Before 5.6.4, any argument is\nignored.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_TIMESTAMP(), UTC_TIMESTAMP() + 0;\n -> \'2003-08-14 18:08:04\', 20030814180804.000000\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (543,12,'AES_ENCRYPT','Syntax:\nAES_ENCRYPT(str,key_str[,init_vector])\n\nAES_ENCRYPT() and AES_DECRYPT() implement encryption and decryption of\ndata using the official AES (Advanced Encryption Standard) algorithm,\npreviously known as "Rijndael." The AES standard permits various key\nlengths. By default these functions implement AES with a 128-bit key\nlength. As of MySQL 5.6.17, key lengths of 196 or 256 bits can be used,\nas described later. The key length is a trade off between performance\nand security.\n\nAES_ENCRYPT() encrypts the string str using the key string key_str and\nreturns a binary string containing the encrypted output. AES_DECRYPT()\ndecrypts the encrypted string crypt_str using the key string key_str\nand returns the original cleartext string. If either function argument\nis NULL, the function returns NULL.\n\nThe str and crypt_str arguments can be any length, and padding is\nautomatically added to str so it is a multiple of a block as required\nby block-based algorithms such as AES. This padding is automatically\nremoved by the AES_DECRYPT() function. The length of crypt_str can be\ncalculated using this formula:\n\n16 * (trunc(string_length / 16) + 1)\n\nFor a key length of 128 bits, the most secure way to pass a key to the\nkey_str argument is to create a truly random 128-bit value and pass it\nas a binary value. For example:\n\nINSERT INTO t\nVALUES (1,AES_ENCRYPT(\'text\',UNHEX(\'F3229A0B371ED2D9441B830D21A390C3\')));\n\nA passphrase can be used to generate an AES key by hashing the\npassphrase. For example:\n\nINSERT INTO t\nVALUES (1,AES_ENCRYPT(\'text\', UNHEX(SHA2(\'My secret passphrase\',512))));\n\nDo not pass a password or passphrase directly to crypt_str, hash it\nfirst. Previous versions of this documentation suggested the former\napproach, but it is no longer recommended as the examples shown here\nare more secure.\n\nIf AES_DECRYPT() detects invalid data or incorrect padding, it returns\nNULL. However, it is possible for AES_DECRYPT() to return a non-NULL\nvalue (possibly garbage) if the input data or the key is invalid.\n\nAs of MySQL 5.6.17, AES_ENCRYPT() and AES_DECRYPT() permit control of\nthe block encryption mode and take an optional init_vector\ninitialization vector argument:\n\no The block_encryption_mode system variable controls the mode for\n block-based encryption algorithms. Its default value is aes-128-ecb,\n which signifies encryption using a key length of 128 bits and ECB\n mode. For a description of the permitted values of this variable, see\n http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html.\n\no The optional init_vector argument provides an initialization vector\n for block encryption modes that require it.\n\nFor modes that require the optional init_vector argument, it must be 16\nbytes or longer (bytes in excess of 16 are ignored). An error occurs if\ninit_vector is missing.\n\nFor modes that do not require init_vector, it is ignored and a warning\nis generated if it is specified.\n\nA random string of bytes to use for the initialization vector can be\nproduced by calling RANDOM_BYTES(16). For encryption modes that require\nan initialization vector, the same vector must be used for encryption\nand decryption.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html\n\n','mysql> SET block_encryption_mode = \'aes-256-cbc\';\nmysql> SET @key_str = SHA2(\'My secret passphrase\',512);\nmysql> SET @init_vector = RANDOM_BYTES(16);\nmysql> SET @crypt_str = AES_ENCRYPT(\'text\',@key_str,@init_vector);\nmysql> SELECT AES_DECRYPT(@crypt_str,@key_str,@init_vector);\n+-----------------------------------------------+\n| AES_DECRYPT(@crypt_str,@key_str,@init_vector) |\n+-----------------------------------------------+\n| text |\n+-----------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.6/en/encryption-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (544,3,'+','Syntax:\n+\n\nAddition:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/arithmetic-functions.html\n\n','mysql> SELECT 3+5;\n -> 8\n','http://dev.mysql.com/doc/refman/5.6/en/arithmetic-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (545,7,'GTID_SUBTRACT','Syntax:\nGTID_SUBTRACT(set,subset)\n\nGiven two sets of global transaction IDs subset and set, returns only\nthose GTIDs from set that are not in subset.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html\n\n','mysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:22-57\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:26-57\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-24\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\', \n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-24\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:21-22:25-57\n1 row in set (0.01 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (545,7,'GTID_SUBTRACT','Syntax:\nGTID_SUBTRACT(set,subset)\n\nGiven two sets of global transaction IDs subset and set, returns only\nthose GTIDs from set that are not in subset.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html\n\n','mysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:21\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:22-57\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:20-25\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:26-57\n1 row in set (0.00 sec)\n\nmysql> SELECT GTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n -> \'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-24\')\\G\n*************************** 1. row ***************************\nGTID_SUBTRACT(\'3E11FA47-71CA-11E1-9E33-C80AA9429562:21-57\',\n \'3E11FA47-71CA-11E1-9E33-C80AA9429562:23-24\'): 3e11fa47-71ca-11e1-9e33-c80aa9429562:21-22:25-57\n1 row in set (0.01 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/gtid-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (546,14,'INET_NTOA','Syntax:\nINET_NTOA(expr)\n\nGiven a numeric IPv4 network address in network byte order, returns the\ndotted-quad string representation of the address as a nonbinary string\nin the connection character set. INET_NTOA() returns NULL if it does\nnot understand its argument.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_NTOA(167773449);\n -> \'10.0.5.9\'\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (547,32,'DAYOFWEEK','Syntax:\nDAYOFWEEK(date)\n\nReturns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 =\nSaturday). These index values correspond to the ODBC standard.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFWEEK(\'2007-02-03\');\n -> 7\n','http://dev.mysql.com/doc/refman/5.6/en/date-and-time-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (548,3,'CEILING','Syntax:\nCEILING(X)\n\nReturns the smallest integer value not less than X.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT CEILING(1.23);\n -> 2\nmysql> SELECT CEILING(-1.23);\n -> -1\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (549,27,'SHOW PROCESSLIST','Syntax:\nSHOW [FULL] PROCESSLIST\n\nSHOW PROCESSLIST shows you which threads are running. You can also get\nthis information from the INFORMATION_SCHEMA PROCESSLIST table or the\nmysqladmin processlist command. If you have the PROCESS privilege, you\ncan see all threads. Otherwise, you can see only your own threads (that\nis, threads associated with the MySQL account that you are using). If\nyou do not use the FULL keyword, only the first 100 characters of each\nstatement are shown in the Info field.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-processlist.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-processlist.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (550,33,'LINEFROMWKB','LineFromWKB(wkb[,srid]), LineStringFromWKB(wkb[,srid])\n\nST_LineFromWKB(), ST_LineStringFromWKB(), LineFromWKB(), and\nLineStringFromWKB() are synonyms. For more information, see the\ndescription of ST_LineFromWKB().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-wkb-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (551,37,'GEOMETRYTYPE','GeometryType(g)\n\nST_GeometryType() and GeometryType() are synonyms. For more\ninformation, see the description of ST_GeometryType().\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/gis-general-property-functions.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (552,40,'CREATE VIEW','Syntax:\nCREATE\n [OR REPLACE]\n [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n [DEFINER = { user | CURRENT_USER }]\n [SQL SECURITY { DEFINER | INVOKER }]\n VIEW view_name [(column_list)]\n AS select_statement\n [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\nview if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW is the same as ALTER VIEW.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (Selecting from the view selects, in effect, using the\nSELECT statement.) The select_statement can select from base tables or\nother views.\n\nThe view definition is "frozen" at creation time and is not affected by\nsubsequent changes to the definitions of the underlying tables. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view, and columns dropped\nfrom the table will result in an error when selecting from the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement, you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. CREATE VIEW might also\nrequire the SUPER privilege, depending on the DEFINER value, as\ndescribed later in this section.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nuse db_name.view_name syntax to qualify the view name with the database\nname:\n\nmysql> CREATE VIEW test.v AS SELECT * FROM t;\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns, or expressions that use functions, constant values,\noperators, and so forth.\n\nA view must have unique column names with no duplicates, just like a\nbase table. By default, the names of the columns retrieved by the\nSELECT statement are used for the view column names. To define explicit\nnames for the view columns, the optional column_list clause can be\ngiven as a list of comma-separated identifiers. The number of names in\ncolumn_list must be the same as the number of columns retrieved by the\nSELECT statement.\n\nUnqualified table or view names in the SELECT statement are interpreted\nwith respect to the default database. A view can refer to tables or\nviews in other databases by qualifying the table or view name with the\nappropriate database name.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables.\n\nThe following example defines a view that selects two columns from\nanother table as well as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty | price | value |\n+------+-------+-------+\n| 3 | 50 | 150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot contain a subquery in the FROM clause.\n\no The SELECT statement cannot refer to system variables or user-defined\n variables.\n\no Within a stored program, the SELECT statement cannot refer to program\n parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. After the\n view has been created, it is possible to drop a table or view that\n the definition refers to. In this case, use of the view results in an\n error. To check a view definition for problems of this kind, use the\n CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n create a TEMPORARY view.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n the maximum column length of 64 characters (not the maximum alias\n length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY or\nfiltering or grouping. When ORDER BY is combined with LIMIT or OFFSET\nin a view definition, the ordering is always enforced before the query\nresult is used by the outer query, but it does not guarantee that the\nsame ordering is used in the end result. As a workaround, add an ORDER\nBY clause to the outer query.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE,\nLOCK IN SHARE MODE, and PROCEDURE.\n\nIf you create a view and then change the query processing environment\nby changing system variables, that may affect the results you get from\nthe view:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER (the default) and INVOKER. These\nindicate that the required privileges must be held by the user who\ndefined or invoked the view, respectively.\n\nIf a user value is given for the DEFINER clause, it should be a MySQL\naccount specified as \'user_name\'@\'host_name\' (the same format used in\nthe GRANT statement), CURRENT_USER, or CURRENT_USER(). The default\nDEFINER value is the user who executes the CREATE VIEW statement. This\nis the same as specifying DEFINER = CURRENT_USER explicitly.\n\nIf you specify the DEFINER clause, these rules determine the valid\nDEFINER user values:\n\no If you do not have the SUPER privilege, the only valid user value is\n your own account, either specified literally or by using\n CURRENT_USER. You cannot set the definer to some other account.\n\no If you have the SUPER privilege, you can specify any syntactically\n valid account name. If the account does not exist, a warning is\n generated.\n\no Although it is possible to create a view with a nonexistent DEFINER\n account, an error occurs when the view is referenced if the SQL\n SECURITY value is DEFINER but the definer account does not exist.\n\nFor more information about view security, see\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-programs-security.html.\n\nWithin a view definition, CURRENT_USER returns the view\'s DEFINER value\nby default. For views defined with the SQL SECURITY INVOKER\ncharacteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttp://dev.mysql.com/doc/refman/5.6/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nMySQL checks view privileges like this:\n\no At view definition time, the view creator must have the privileges\n needed to use the top-level objects accessed by the view. For\n example, if the view definition refers to table columns, the creator\n must have some privilege for each column in the select list of the\n definition, and the SELECT privilege for each column used elsewhere\n in the definition. If the definition refers to a stored function,\n only the privileges needed to invoke the function can be checked. The\n privileges required at function invocation time can be checked only\n as it executes: For different invocations, different execution paths\n within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n access it (SELECT to select from it, INSERT to insert into it, and so\n forth.)\n\no When a view has been referenced, privileges for objects accessed by\n the view are checked against the privileges held by the view DEFINER\n account or invoker, depending on whether the SQL SECURITY\n characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n privilege checking for statements executed within the function depend\n on whether the function SQL SECURITY characteristic is DEFINER or\n INVOKER. If the security characteristic is DEFINER, the function runs\n with the privileges of the DEFINER account. If the characteristic is\n INVOKER, the function runs with the privileges determined by the\n view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n CALL p1();\nELSE\n CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. The default algorithm is UNDEFINED if\nno ALGORITHM clause is present. For more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/view-algorithms.html.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttp://dev.mysql.com/doc/refman/5.6/en/view-updatability.html, and\nhttp://dev.mysql.com/doc/refman/5.6/en/view-check-option.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-view.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (552,40,'CREATE VIEW','Syntax:\nCREATE\n [OR REPLACE]\n [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n [DEFINER = { user | CURRENT_USER }]\n [SQL SECURITY { DEFINER | INVOKER }]\n VIEW view_name [(column_list)]\n AS select_statement\n [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\nview if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW is the same as ALTER VIEW.\n\nFor information about restrictions on view use, see\nhttp://dev.mysql.com/doc/refman/5.6/en/view-restrictions.html.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (Selecting from the view selects, in effect, using the\nSELECT statement.) The select_statement can select from base tables or\nother views.\n\nThe view definition is "frozen" at creation time and is not affected by\nsubsequent changes to the definitions of the underlying tables. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view, and columns dropped\nfrom the table will result in an error when selecting from the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement, you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. CREATE VIEW might also\nrequire the SUPER privilege, depending on the DEFINER value, as\ndescribed later in this section.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nuse db_name.view_name syntax to qualify the view name with the database\nname:\n\nCREATE VIEW test.v AS SELECT * FROM t;\n\nUnqualified table or view names in the SELECT statement are also\ninterpreted with respect to the default database. A view can refer to\ntables or views in other databases by qualifying the table or view name\nwith the appropriate database name.\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns, or expressions that use functions, constant values,\noperators, and so forth.\n\nA view must have unique column names with no duplicates, just like a\nbase table. By default, the names of the columns retrieved by the\nSELECT statement are used for the view column names. To define explicit\nnames for the view columns, specify the optional column_list clause as\na list of comma-separated identifiers. The number of names in\ncolumn_list must be the same as the number of columns retrieved by the\nSELECT statement.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables:\n\nCREATE VIEW v_today (today) AS SELECT CURRENT_DATE;\n\nThe following example defines a view that selects two columns from\nanother table as well as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty | price | value |\n+------+-------+-------+\n| 3 | 50 | 150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot contain a subquery in the FROM clause.\n\no The SELECT statement cannot refer to system variables or user-defined\n variables.\n\no Within a stored program, the SELECT statement cannot refer to program\n parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. If, after\n the view has been created, a table or view that the definition refers\n to is dropped, use of the view results in an error. To check a view\n definition for problems of this kind, use the CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n create a TEMPORARY view.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n the maximum column length of 64 characters (not the maximum alias\n length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY or\nfiltering or grouping. When ORDER BY is combined with LIMIT or OFFSET\nin a view definition, the ordering is always enforced before the query\nresult is used by the outer query, but it does not guarantee that the\nsame ordering is used in the end result. As a workaround, add an ORDER\nBY clause to the outer query.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE,\nLOCK IN SHARE MODE, and PROCEDURE.\n\nThe results obtained from a view may be affected if you change the\nquery processing environment by changing system variables:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER (the default) and INVOKER. These\nindicate that the required privileges must be held by the user who\ndefined or invoked the view, respectively.\n\nIf a user value is given for the DEFINER clause, it should be a MySQL\naccount specified as \'user_name\'@\'host_name\', CURRENT_USER, or\nCURRENT_USER(). The default DEFINER value is the user who executes the\nCREATE VIEW statement. This is the same as specifying DEFINER =\nCURRENT_USER explicitly.\n\nIf the DEFINER clause is present, these rules determine the valid\nDEFINER user values:\n\no If you do not have the SUPER privilege, the only valid user value is\n your own account, either specified literally or by using\n CURRENT_USER. You cannot set the definer to some other account.\n\no If you have the SUPER privilege, you can specify any syntactically\n valid account name. If the account does not exist, a warning is\n generated.\n\no Although it is possible to create a view with a nonexistent DEFINER\n account, an error occurs when the view is referenced if the SQL\n SECURITY value is DEFINER but the definer account does not exist.\n\nFor more information about view security, see\nhttp://dev.mysql.com/doc/refman/5.6/en/stored-programs-security.html.\n\nWithin a view definition, CURRENT_USER returns the view\'s DEFINER value\nby default. For views defined with the SQL SECURITY INVOKER\ncharacteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttp://dev.mysql.com/doc/refman/5.6/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nMySQL checks view privileges like this:\n\no At view definition time, the view creator must have the privileges\n needed to use the top-level objects accessed by the view. For\n example, if the view definition refers to table columns, the creator\n must have some privilege for each column in the select list of the\n definition, and the SELECT privilege for each column used elsewhere\n in the definition. If the definition refers to a stored function,\n only the privileges needed to invoke the function can be checked. The\n privileges required at function invocation time can be checked only\n as it executes: For different invocations, different execution paths\n within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n access it (SELECT to select from it, INSERT to insert into it, and so\n forth.)\n\no When a view has been referenced, privileges for objects accessed by\n the view are checked against the privileges held by the view DEFINER\n account or invoker, depending on whether the SQL SECURITY\n characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n privilege checking for statements executed within the function depend\n on whether the function SQL SECURITY characteristic is DEFINER or\n INVOKER. If the security characteristic is DEFINER, the function runs\n with the privileges of the DEFINER account. If the characteristic is\n INVOKER, the function runs with the privileges determined by the\n view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n CALL p1();\nELSE\n CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. The default algorithm is UNDEFINED if\nno ALGORITHM clause is present. For more information, see\nhttp://dev.mysql.com/doc/refman/5.6/en/view-algorithms.html, as well as\nhttp://dev.mysql.com/doc/refman/5.6/en/subquery-optimization.html#deriv\ned-table-optimization.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttp://dev.mysql.com/doc/refman/5.6/en/view-updatability.html, and\nhttp://dev.mysql.com/doc/refman/5.6/en/view-check-option.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/create-view.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (553,38,'TRIM','Syntax:\nTRIM([{BOTH | LEADING | TRAILING} [remstr] FROM] str), TRIM([remstr\nFROM] str)\n\nReturns the string str with all remstr prefixes or suffixes removed. If\nnone of the specifiers BOTH, LEADING, or TRAILING is given, BOTH is\nassumed. remstr is optional and, if not specified, spaces are removed.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-functions.html\n\n','mysql> SELECT TRIM(\' bar \');\n -> \'bar\'\nmysql> SELECT TRIM(LEADING \'x\' FROM \'xxxbarxxx\');\n -> \'barxxx\'\nmysql> SELECT TRIM(BOTH \'x\' FROM \'xxxbarxxx\');\n -> \'bar\'\nmysql> SELECT TRIM(TRAILING \'xyz\' FROM \'barxxyz\');\n -> \'barx\'\n','http://dev.mysql.com/doc/refman/5.6/en/string-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (554,14,'INET6_NTOA','Syntax:\nINET6_NTOA(expr)\n\nGiven an IPv6 or IPv4 network address represented in numeric form as a\nbinary string, returns the string representation of the address as a\nnonbinary string in the connection character set. If the argument is\nnot a valid address, INET6_NTOA() returns NULL.\n\nINET6_NTOA() has these properties:\n\no It does not use operating system functions to perform conversions,\n thus the output string is platform independent.\n\no The return string has a maximum length of 39 (4 x 8 + 7). Given this\n statement:\n\nCREATE TABLE t AS SELECT INET6_NTOA(expr) AS c1;\n\n The resulting table would have this definition:\n\nCREATE TABLE t (c1 VARCHAR(39) CHARACTER SET utf8 DEFAULT NULL);\n\no The return string uses lowercase letters for IPv6 addresses.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html\n\n','mysql> SELECT INET6_NTOA(INET6_ATON(\'fdfe::5a55:caff:fefa:9089\'));\n -> \'fdfe::5a55:caff:fefa:9089\'\nmysql> SELECT INET6_NTOA(INET6_ATON(\'10.0.5.9\'));\n -> \'10.0.5.9\'\n\nmysql> SELECT INET6_NTOA(UNHEX(\'FDFE0000000000005A55CAFFFEFA9089\'));\n -> \'fdfe::5a55:caff:fefa:9089\'\nmysql> SELECT INET6_NTOA(UNHEX(\'0A000509\'));\n -> \'10.0.5.9\'\n','http://dev.mysql.com/doc/refman/5.6/en/miscellaneous-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (555,24,'SIGNAL','Syntax:\nSIGNAL condition_value\n [SET signal_information_item\n [, signal_information_item] ...]\n\ncondition_value:\n SQLSTATE [VALUE] sqlstate_value\n | condition_name\n\nsignal_information_item:\n condition_information_item_name = simple_value_specification\n\ncondition_information_item_name:\n CLASS_ORIGIN\n | SUBCLASS_ORIGIN\n | MESSAGE_TEXT\n | MYSQL_ERRNO\n | CONSTRAINT_CATALOG\n | CONSTRAINT_SCHEMA\n | CONSTRAINT_NAME\n | CATALOG_NAME\n | SCHEMA_NAME\n | TABLE_NAME\n | COLUMN_NAME\n | CURSOR_NAME\n\ncondition_name, simple_value_specification:\n (see following discussion)\n\nSIGNAL is the way to "return" an error. SIGNAL provides error\ninformation to a handler, to an outer portion of the application, or to\nthe client. Also, it provides control over the error\'s characteristics\n(error number, SQLSTATE value, message). Without SIGNAL, it is\nnecessary to resort to workarounds such as deliberately referring to a\nnonexistent table to cause a routine to return an error.\n\nNo special privileges are required to execute the SIGNAL statement.\n\nTo retrieve information from the diagnostics area, use the GET\nDIAGNOSTICS statement (see [HELP GET DIAGNOSTICS]). For information\nabout the diagnostics area, see\nhttp://dev.mysql.com/doc/refman/5.6/en/diagnostics-area.html.\n\nThe condition_value in a SIGNAL statement indicates the error value to\nbe returned. It can be an SQLSTATE value (a 5-character string literal)\nor a condition_name that refers to a named condition previously defined\nwith DECLARE ... CONDITION (see [HELP DECLARE CONDITION]).\n\nAn SQLSTATE value can indicate errors, warnings, or "not found." The\nfirst two characters of the value indicate its error class, as\ndiscussed in\nhttp://dev.mysql.com/doc/refman/5.6/en/signal.html#signal-condition-inf\normation-items. Some signal values cause statement termination; see\nhttp://dev.mysql.com/doc/refman/5.6/en/signal.html#signal-effects.\n\nThe SQLSTATE value for a SIGNAL statement should not start with \'00\'\nbecause such values indicate success and are not valid for signaling an\nerror. This is true whether the SQLSTATE value is specified directly in\nthe SIGNAL statement or in a named condition referred to in the\nstatement. If the value is invalid, a Bad SQLSTATE error occurs.\n\nTo signal a generic SQLSTATE value, use \'45000\', which means "unhandled\nuser-defined exception."\n\nThe SIGNAL statement optionally includes a SET clause that contains\nmultiple signal items, in a comma-separated list of\ncondition_information_item_name = simple_value_specification\nassignments.\n\nEach condition_information_item_name may be specified only once in the\nSET clause. Otherwise, a Duplicate condition information item error\noccurs.\n\nValid simple_value_specification designators can be specified using\nstored procedure or function parameters, stored program local variables\ndeclared with DECLARE, user-defined variables, system variables, or\nliterals. A character literal may include a _charset introducer.\n\nFor information about permissible condition_information_item_name\nvalues, see\nhttp://dev.mysql.com/doc/refman/5.6/en/signal.html#signal-condition-inf\normation-items.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/signal.html\n\n','CREATE PROCEDURE p (pval INT)\nBEGIN\n DECLARE specialty CONDITION FOR SQLSTATE \'45000\';\n IF pval = 0 THEN\n SIGNAL SQLSTATE \'01000\';\n ELSEIF pval = 1 THEN\n SIGNAL SQLSTATE \'45000\'\n SET MESSAGE_TEXT = \'An error occurred\';\n ELSEIF pval = 2 THEN\n SIGNAL specialty\n SET MESSAGE_TEXT = \'An error occurred\';\n ELSE\n SIGNAL SQLSTATE \'01000\'\n SET MESSAGE_TEXT = \'A warning occurred\', MYSQL_ERRNO = 1000;\n SIGNAL SQLSTATE \'45000\'\n SET MESSAGE_TEXT = \'An error occurred\', MYSQL_ERRNO = 1001;\n END IF;\nEND;\n','http://dev.mysql.com/doc/refman/5.6/en/signal.html'); @@ -651,7 +651,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (571,28,'INSERT DELAYED','Syntax:\nINSERT DELAYED ...\n\nThe DELAYED option for the INSERT statement is a MySQL extension to\nstandard SQL that can be used for certain kinds of tables (such as\nMyISAM). When a client uses INSERT DELAYED, it gets an okay from the\nserver at once, and the row is queued to be inserted when the table is\nnot in use by any other thread.\n\n*Note*: INSERT DELAYED is slower than a normal INSERT if the table is\nnot otherwise in use. There is also the additional overhead for the\nserver to handle a separate thread for each table for which there are\ndelayed rows. This means that you should use INSERT DELAYED only when\nyou are really sure that you need it. As of MySQL 5.6.6, INSERT DELAYED\nis deprecated, and will be removed in a future release. Use INSERT\n(without DELAYED) instead.\n\nThe queued rows are held only in memory until they are inserted into\nthe table. This means that if you terminate mysqld forcibly (for\nexample, with kill -9) or if mysqld dies unexpectedly, any queued rows\nthat have not been written to disk are lost.\n\nThere are some constraints on the use of DELAYED:\n\no INSERT DELAYED works only with MyISAM, MEMORY, ARCHIVE, and BLACKHOLE\n tables. For engines that do not support DELAYED, an error occurs.\n\no An error occurs for INSERT DELAYED if used with a table that has been\n locked with LOCK TABLES because the insert must be handled by a\n separate thread, not by the session that holds the lock.\n\no For MyISAM tables, if there are no free blocks in the middle of the\n data file, concurrent SELECT and INSERT statements are supported.\n Under these circumstances, you very seldom need to use INSERT DELAYED\n with MyISAM.\n\no INSERT DELAYED should be used only for INSERT statements that specify\n value lists. The server ignores DELAYED for INSERT ... SELECT or\n INSERT ... ON DUPLICATE KEY UPDATE statements.\n\no Because the INSERT DELAYED statement returns immediately, before the\n rows are inserted, you cannot use LAST_INSERT_ID() to get the\n AUTO_INCREMENT value that the statement might generate.\n\no DELAYED rows are not visible to SELECT statements until they actually\n have been inserted.\n\no Prior to MySQL 5.6, INSERT DELAYED was treated as a normal INSERT if\n the statement inserted multiple rows, binary logging was enabled, and\n the global logging format was statement-based (that is, whenever\n binlog_format was set to STATEMENT). Beginning with MySQL 5.6, INSERT\n DELAYED is always handled as a simple INSERT (that is, without the\n DELAYED option) whenever the value of binlog_format is STATEMENT or\n MIXED. (In the latter case, the statement no longer triggers a switch\n to row-based logging, and so is logged using the statement-based\n format.)\n\n This does not apply when using row-based binary logging mode\n (binlog_format set to ROW), in which INSERT DELAYED statements are\n always executed using the DELAYED option as specified, and logged as\n row-update events.\n\no DELAYED is ignored on slave replication servers, so that INSERT\n DELAYED is treated as a normal INSERT on slaves. This is because\n DELAYED could cause the slave to have different data than the master.\n\no Pending INSERT DELAYED statements are lost if a table is write locked\n and ALTER TABLE is used to modify the table structure.\n\no INSERT DELAYED is not supported for views.\n\no INSERT DELAYED is not supported for partitioned tables.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/insert-delayed.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/insert-delayed.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (572,27,'SHOW PROCEDURE CODE','Syntax:\nSHOW PROCEDURE CODE proc_name\n\nThis statement is a MySQL extension that is available only for servers\nthat have been built with debugging support. It displays a\nrepresentation of the internal implementation of the named stored\nprocedure. A similar statement, SHOW FUNCTION CODE, displays\ninformation about stored functions (see [HELP SHOW FUNCTION CODE]).\n\nTo use either statement, you must be the owner of the routine or have\nSELECT access to the mysql.proc table.\n\nIf the named routine is available, each statement produces a result\nset. Each row in the result set corresponds to one "instruction" in the\nroutine. The first column is Pos, which is an ordinal number beginning\nwith 0. The second column is Instruction, which contains an SQL\nstatement (usually changed from the original source), or a directive\nwhich has meaning only to the stored-routine handler.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-procedure-code.html\n\n','mysql> DELIMITER //\nmysql> CREATE PROCEDURE p1 ()\n -> BEGIN\n -> DECLARE fanta INT DEFAULT 55;\n -> DROP TABLE t2;\n -> LOOP\n -> INSERT INTO t3 VALUES (fanta);\n -> END LOOP;\n -> END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SHOW PROCEDURE CODE p1//\n+-----+----------------------------------------+\n| Pos | Instruction |\n+-----+----------------------------------------+\n| 0 | set fanta@0 55 |\n| 1 | stmt 9 "DROP TABLE t2" |\n| 2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |\n| 3 | jump 2 |\n+-----+----------------------------------------+\n4 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.6/en/show-procedure-code.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (573,23,'MEDIUMTEXT','MEDIUMTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 16,777,215 (224 − 1)\ncharacters. The effective maximum length is less if the value contains\nmultibyte characters. Each MEDIUMTEXT value is stored using a 3-byte\nlength prefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/string-type-overview.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (574,27,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.6/en/extended-show.html. For example:\n\nmysql> SHOW COLLATION LIKE \'latin1%\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1 | 5 | | | 0 |\n| latin1_swedish_ci | latin1 | 8 | Yes | Yes | 0 |\n| latin1_danish_ci | latin1 | 15 | | | 0 |\n| latin1_german2_ci | latin1 | 31 | | Yes | 2 |\n| latin1_bin | latin1 | 47 | | Yes | 0 |\n| latin1_general_ci | latin1 | 48 | | | 0 |\n| latin1_general_cs | latin1 | 49 | | | 0 |\n| latin1_spanish_ci | latin1 | 94 | | | 0 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-collation.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-collation.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (574,27,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.6/en/extended-show.html. For example:\n\nmysql> SHOW COLLATION WHERE Charset = \'latin1\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1 | 5 | | Yes | 1 |\n| latin1_swedish_ci | latin1 | 8 | Yes | Yes | 1 |\n| latin1_danish_ci | latin1 | 15 | | Yes | 1 |\n| latin1_german2_ci | latin1 | 31 | | Yes | 2 |\n| latin1_bin | latin1 | 47 | | Yes | 1 |\n| latin1_general_ci | latin1 | 48 | | Yes | 1 |\n| latin1_general_cs | latin1 | 49 | | Yes | 1 |\n| latin1_spanish_ci | latin1 | 94 | | Yes | 1 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/show-collation.html\n\n','','http://dev.mysql.com/doc/refman/5.6/en/show-collation.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (575,3,'LOG','Syntax:\nLOG(X), LOG(B,X)\n\nIf called with one parameter, this function returns the natural\nlogarithm of X. If X is less than or equal to 0, then NULL is returned.\n\nThe inverse of this function (when called with a single argument) is\nthe EXP() function.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT LOG(2);\n -> 0.69314718055995\nmysql> SELECT LOG(-2);\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (576,20,'!=','Syntax:\n<>, !=\n\nNot equal:\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','mysql> SELECT \'.01\' <> \'0.01\';\n -> 1\nmysql> SELECT .01 <> \'0.01\';\n -> 0\nmysql> SELECT \'zapp\' <> \'zappp\';\n -> 1\n','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (577,24,'WHILE','Syntax:\n[begin_label:] WHILE search_condition DO\n statement_list\nEND WHILE [end_label]\n\nThe statement list within a WHILE statement is repeated as long as the\nsearch_condition expression is true. statement_list consists of one or\nmore SQL statements, each terminated by a semicolon (;) statement\ndelimiter.\n\nA WHILE statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/while.html\n\n','CREATE PROCEDURE dowhile()\nBEGIN\n DECLARE v1 INT DEFAULT 5;\n\n WHILE v1 > 0 DO\n ...\n SET v1 = v1 - 1;\n END WHILE;\nEND;\n','http://dev.mysql.com/doc/refman/5.6/en/while.html'); @@ -659,7 +659,7 @@ INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (579,3,'RADIANS','Syntax:\nRADIANS(X)\n\nReturns the argument X, converted from degrees to radians.\n\n*Note*: π radians equals 180 degrees.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html\n\n','mysql> SELECT RADIANS(90);\n -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.6/en/mathematical-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (580,17,'COLLATION','Syntax:\nCOLLATION(str)\n\nReturns the collation of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/information-functions.html\n\n','mysql> SELECT COLLATION(\'abc\');\n -> \'latin1_swedish_ci\'\nmysql> SELECT COLLATION(_utf8\'abc\');\n -> \'utf8_general_ci\'\n','http://dev.mysql.com/doc/refman/5.6/en/information-functions.html'); INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (581,20,'COALESCE','Syntax:\nCOALESCE(value,...)\n\nReturns the first non-NULL value in the list, or NULL if there are no\nnon-NULL values.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html\n\n','mysql> SELECT COALESCE(NULL,1);\n -> 1\nmysql> SELECT COALESCE(NULL,NULL,NULL);\n -> NULL\n','http://dev.mysql.com/doc/refman/5.6/en/comparison-operators.html'); -INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (582,17,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttp://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/information-functions.html\n\n','mysql> SELECT VERSION();\n -> \'5.6.32-standard\'\n','http://dev.mysql.com/doc/refman/5.6/en/information-functions.html'); +INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (582,17,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttp://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.6/en/information-functions.html\n\n','mysql> SELECT VERSION();\n -> \'5.6.34-standard\'\n','http://dev.mysql.com/doc/refman/5.6/en/information-functions.html'); INSERT INTO help_keyword (help_keyword_id,name) VALUES (0,'JOIN'); INSERT INTO help_keyword (help_keyword_id,name) VALUES (1,'HOST'); diff -Nru mysql-5.6-5.6.31/scripts/mysqld_safe.sh mysql-5.6-5.6.33/scripts/mysqld_safe.sh --- mysql-5.6-5.6.31/scripts/mysqld_safe.sh 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/scripts/mysqld_safe.sh 2016-08-26 11:22:35.000000000 +0000 @@ -209,8 +209,17 @@ --core-file-size=*) core_file_size="$val" ;; --ledir=*) ledir="$val" ;; --malloc-lib=*) set_malloc_lib "$val" ;; - --mysqld=*) MYSQLD="$val" ;; + --mysqld=*) + if [ -z "$pick_args" ]; then + log_error "--mysqld option can only be used as command line option, found in config file" + exit 1 + fi + MYSQLD="$val" ;; --mysqld-version=*) + if [ -z "$pick_args" ]; then + log_error "--mysqld-version option can only be used as command line option, found in config file" + exit 1 + fi if test -n "$val" then MYSQLD="mysqld-$val" @@ -298,38 +307,22 @@ echo "$text" } - -mysql_config= -get_mysql_config() { - if [ -z "$mysql_config" ]; then - mysql_config=`echo "$0" | sed 's,/[^/][^/]*$,/mysql_config,'` - if [ ! -x "$mysql_config" ]; then - log_error "Can not run mysql_config $@ from '$mysql_config'" - exit 1 - fi - fi - - "$mysql_config" "$@" -} - - # set_malloc_lib LIB # - If LIB is empty, do nothing and return -# - If LIB is 'tcmalloc', look for tcmalloc shared library in /usr/lib -# then pkglibdir. tcmalloc is part of the Google perftools project. +# - If LIB is 'tcmalloc', look for tcmalloc shared library in $malloc_dirs. +# tcmalloc is part of the Google perftools project. # - If LIB is an absolute path, assume it is a malloc shared library # # Put LIB in mysqld_ld_preload, which will be added to LD_PRELOAD when # running mysqld. See ld.so for details. set_malloc_lib() { + # This list is kept intentionally simple. + malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu" malloc_lib="$1" if [ "$malloc_lib" = tcmalloc ]; then - pkglibdir=`get_mysql_config --variable=pkglibdir` malloc_lib= - # This list is kept intentionally simple. Simply set --malloc-lib - # to a full path if another location is desired. - for libdir in /usr/lib "$pkglibdir" "$pkglibdir/mysql"; do + for libdir in `echo $malloc_dirs`; do for flavor in _minimal '' _and_profiler _debug; do tmp="$libdir/libtcmalloc$flavor.so" #log_notice "DEBUG: Checking for malloc lib '$tmp'" @@ -340,7 +333,7 @@ done if [ -z "$malloc_lib" ]; then - log_error "no shared library for --malloc-lib=tcmalloc found in /usr/lib or $pkglibdir" + log_error "no shared library for --malloc-lib=tcmalloc found in $malloc_dirs" exit 1 fi fi @@ -351,9 +344,21 @@ case "$malloc_lib" in /*) if [ ! -r "$malloc_lib" ]; then - log_error "--malloc-lib '$malloc_lib' can not be read and will not be used" + log_error "--malloc-lib can not be read and will not be used" exit 1 fi + + # Restrict to a the list in $malloc_dirs above + case "`dirname "$malloc_lib"`" in + /usr/lib) ;; + /usr/lib64) ;; + /usr/lib/i386-linux-gnu) ;; + /usr/lib/x86_64-linux-gnu) ;; + *) + log_error "--malloc-lib must be located in one of the directories: $malloc_dirs" + exit 1 + ;; + esac ;; *) log_error "--malloc-lib must be an absolute path or 'tcmalloc'; " \ @@ -569,7 +574,7 @@ log_notice "Logging to '$err_log'." logging=file - if [ ! -f "$err_log" ]; then # if error log already exists, + if [ ! -f "$err_log" -a ! -h "$err_log" ]; then # if error log already exists, touch "$err_log" # we just append. otherwise, chmod "$fmode" "$err_log" # fix the permissions here! fi @@ -594,7 +599,7 @@ USER_OPTION="--user=$user" fi # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then + if [ $want_syslog -eq 0 -a ! -h "$err_log" ]; then touch "$err_log" chown $user "$err_log" fi @@ -614,9 +619,11 @@ mysql_unix_port_dir=`dirname $safe_mysql_unix_port` if [ ! -d $mysql_unix_port_dir ] then - mkdir $mysql_unix_port_dir - chown $user $mysql_unix_port_dir - chmod 755 $mysql_unix_port_dir + if [ ! -h $mysql_unix_port_dir ]; then + mkdir $mysql_unix_port_dir + chown $user $mysql_unix_port_dir + chmod 755 $mysql_unix_port_dir + fi fi # If the user doesn't specify a binary, we assume name "mysqld" @@ -728,7 +735,9 @@ exit 1 fi fi - rm -f "$pid_file" + if [ ! -h "$pid_file" ]; then + rm -f "$pid_file" + fi if test -f "$pid_file" then log_error "Fatal error: Can't remove the pid file: @@ -779,13 +788,19 @@ while true do - rm -f $safe_mysql_unix_port "$pid_file" # Some extra safety + # Some extra safety + if [ ! -h "$safe_mysql_unix_port" ]; then + rm -f "$safe_mysql_unix_port" + fi + if [ ! -h "$pid_file" ]; then + rm -f "$pid_file" + fi start_time=`date +%M%S` eval_log_error "$cmd" - if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then + if [ $want_syslog -eq 0 -a ! -f "$err_log" -a ! -h "$err_log" ]; then touch "$err_log" # hypothetical: log was renamed but not chown $user "$err_log" # flushed yet. we'd recreate it with chmod "$fmode" "$err_log" # wrong owner next time we log, so set diff -Nru mysql-5.6-5.6.31/sql/binlog.cc mysql-5.6-5.6.33/sql/binlog.cc --- mysql-5.6-5.6.31/sql/binlog.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/binlog.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1992,17 +1992,16 @@ This function checks if a transactional table was updated by the current statement. - @param thd The client thread that executed the current statement. + @param ha_list Registered storage engine handler list. @return @c true if a transactional table was updated, @c false otherwise. */ bool -stmt_has_updated_trans_table(const THD *thd) +stmt_has_updated_trans_table(Ha_trx_info* ha_list) { Ha_trx_info *ha_info; - for (ha_info= thd->transaction.stmt.ha_list; ha_info; - ha_info= ha_info->next()) + for (ha_info= ha_list; ha_info; ha_info= ha_info->next()) { if (ha_info->is_trx_read_write() && ha_info->ht() != binlog_hton) return (TRUE); @@ -3426,23 +3425,48 @@ if (mysql_file_close(index_file.file, MYF(0)) < 0) { error= -1; - sql_print_error("MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file " - "failed to close the index file."); - goto err; + sql_print_error("While rebuilding index file %s: " + "Failed to close the index file.", index_file_name); + /* + Delete Crash safe index file here and recover the binlog.index + state(index_file io_cache) from old binlog.index content. + */ + mysql_file_delete(key_file_binlog_index, crash_safe_index_file_name, + MYF(0)); + + goto recoverable_err; + } + if (DBUG_EVALUATE_IF("force_index_file_delete_failure", 1, 0) || + mysql_file_delete(key_file_binlog_index, index_file_name, MYF(MY_WME))) + { + error= -1; + sql_print_error("While rebuilding index file %s: " + "Failed to delete the existing index file. It could be " + "that file is being used by some other process.", + index_file_name); + /* + Delete Crash safe file index file here and recover the binlog.index + state(index_file io_cache) from old binlog.index content. + */ + mysql_file_delete(key_file_binlog_index, crash_safe_index_file_name, + MYF(0)); + + goto recoverable_err; } - mysql_file_delete(key_file_binlog_index, index_file_name, MYF(MY_WME)); } DBUG_EXECUTE_IF("crash_create_before_rename_index_file", DBUG_SUICIDE();); if (my_rename(crash_safe_index_file_name, index_file_name, MYF(MY_WME))) { error= -1; - sql_print_error("MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file " - "failed to move crash_safe_index_file to index file."); - goto err; + sql_print_error("While rebuilding index file %s: " + "Failed to rename the new index file to the existing " + "index file.", index_file_name); + goto fatal_err; } DBUG_EXECUTE_IF("crash_create_after_rename_index_file", DBUG_SUICIDE();); +recoverable_err: if ((fd= mysql_file_open(key_file_binlog_index, index_file_name, O_RDWR | O_CREAT | O_BINARY, @@ -3452,16 +3476,32 @@ mysql_file_seek(fd, 0L, MY_SEEK_END, MYF(0)), 0, MYF(MY_WME | MY_WAIT_IF_FULL))) { - error= -1; - sql_print_error("MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file " - "failed to open the index file."); - goto err; + sql_print_error("After rebuilding the index file %s: " + "Failed to open the index file.", index_file_name); + goto fatal_err; } -err: if (need_lock_index) mysql_mutex_unlock(&LOCK_index); DBUG_RETURN(error); + +fatal_err: + /* + This situation is very very rare to happen (unless there is some serious + memory related issues like OOM) and should be treated as fatal error. + Hence it is better to bring down the server without respecting + 'binlog_error_action' value here. + */ + exec_binlog_error_action_abort("MySQL server failed to update the " + "binlog.index file's content properly. " + "It might not be in sync with available " + "binlogs and the binlog.index file state is in " + "unrecoverable state. Aborting the server."); + /* + Server is aborted in the above function. + This is dead code to make compiler happy. + */ + DBUG_RETURN(error); } @@ -4364,7 +4404,7 @@ int error_index= 0, close_error_index= 0; /* Read each entry from purge_index_file and delete the file. */ - if (is_inited_purge_index_file() && + if (!error && is_inited_purge_index_file() && (error_index= purge_index_entry(thd, decrease_log_space, false/*need_lock_index=false*/))) sql_print_error("MYSQL_BIN_LOG::purge_logs failed to process registered files" " that would be purged."); @@ -5457,7 +5497,8 @@ *check_purge= false; - if (force_rotate || (my_b_tell(&log_file) >= (my_off_t) max_size)) + if (DBUG_EVALUATE_IF("force_rotate", 1, 0) || force_rotate || + (my_b_tell(&log_file) >= (my_off_t) max_size)) { error= new_file_without_locking(NULL); *check_purge= true; @@ -7250,7 +7291,8 @@ If we need to rotate, we do it without commit error. Otherwise the thd->commit_error will be possibly reset. */ - if (do_rotate && thd->commit_error == THD::CE_NONE) + if (DBUG_EVALUATE_IF("force_rotate", 1, 0) || + (do_rotate && thd->commit_error == THD::CE_NONE)) { /* Do not force the rotate as several consecutive groups may @@ -7860,6 +7902,26 @@ return 0; } +#ifndef DBUG_OFF +const char * get_locked_tables_mode_name(enum_locked_tables_mode locked_tables_mode) +{ + switch (locked_tables_mode) + { + case LTM_NONE: + return "LTM_NONE"; + case LTM_LOCK_TABLES: + return "LTM_LOCK_TABLES"; + case LTM_PRELOCKED: + return "LTM_PRELOCKED"; + case LTM_PRELOCKED_UNDER_LOCK_TABLES: + return "LTM_PRELOCKED_UNDER_LOCK_TABLES"; + default: + return "Unknown table lock mode"; + } +} +#endif + + /** Decide on logging format to use for the statement and issue errors or warnings as needed. The decision depends on the following diff -Nru mysql-5.6-5.6.31/sql/binlog.h mysql-5.6-5.6.33/sql/binlog.h --- mysql-5.6-5.6.31/sql/binlog.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/binlog.h 2016-08-26 11:22:35.000000000 +0000 @@ -690,7 +690,7 @@ extern MYSQL_PLUGIN_IMPORT MYSQL_BIN_LOG mysql_bin_log; bool trans_has_updated_trans_table(const THD* thd); -bool stmt_has_updated_trans_table(const THD *thd); +bool stmt_has_updated_trans_table(Ha_trx_info* ha_list); bool ending_trans(THD* thd, const bool all); bool ending_single_stmt_trans(THD* thd, const bool all); bool trans_cannot_safely_rollback(const THD* thd); diff -Nru mysql-5.6-5.6.31/sql/handler.cc mysql-5.6-5.6.33/sql/handler.cc --- mysql-5.6-5.6.31/sql/handler.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/handler.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1419,7 +1419,7 @@ DEBUG_SYNC(thd, "ha_commit_trans_after_acquire_commit_lock"); } - if (rw_trans && + if (rw_trans && stmt_has_updated_trans_table(ha_info) && opt_readonly && !(thd->security_ctx->master_access & SUPER_ACL) && !thd->slave_thread) diff -Nru mysql-5.6-5.6.31/sql/item_geofunc.h mysql-5.6-5.6.33/sql/item_geofunc.h --- mysql-5.6-5.6.31/sql/item_geofunc.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/item_geofunc.h 2016-08-26 11:22:35.000000000 +0000 @@ -519,7 +519,21 @@ Gcalc_function func; Gcalc_scan_iterator scan_it; public: - Item_func_distance(Item *a, Item *b): Item_real_func(a, b) {} + Item_func_distance(Item *a, Item *b): Item_real_func(a, b) + { + /* + Distance could be NULL, if either of the operands are + not geometries. + */ + maybe_null= true; + } + + void fix_length_and_dec() + { + Item_real_func::fix_length_and_dec(); + maybe_null= true; + } + double val_real(); const char *func_name() const { return "st_distance"; } }; diff -Nru mysql-5.6-5.6.31/sql/log.cc mysql-5.6-5.6.33/sql/log.cc --- mysql-5.6-5.6.31/sql/log.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/log.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1494,6 +1494,78 @@ } +bool is_valid_log_name(const char *name, size_t len) +{ + if (len > 3) + { + const char *tail= name + len - 4; + if (my_strcasecmp(system_charset_info, tail, ".ini") == 0 || + my_strcasecmp(system_charset_info, tail, ".cnf") == 0) + { + return false; + } + } + return true; +} + + +/** + Get the real log file name, and possibly reopen file. + + Use realpath() to get the path with symbolic links + expanded. Then, close the file, and reopen the real path using the + O_NOFOLLOW flag. This will reject following symbolic links. + + @param file File descriptor. + @param log_file_key Key for P_S instrumentation. + @param open_flags Flags to use for opening the file. + @param opened_file_name Name of the open fd. + + @retval file descriptor to open file with 'real_file_name', or '-1' + in case of errors. +*/ + +#ifndef _WIN32 +static File mysql_file_real_name_reopen(File file, +#ifdef HAVE_PSI_INTERFACE + PSI_file_key log_file_key, +#endif + int open_flags, + const char *opened_file_name) +{ + DBUG_ASSERT(file); + DBUG_ASSERT(opened_file_name); + + /* Buffer for realpath must have capacity for PATH_MAX. */ + char real_file_name[PATH_MAX]; + + /* Get realpath, validate, open realpath with O_NOFOLLOW. */ + if (realpath(opened_file_name, real_file_name) == NULL) + { + (void) mysql_file_close(file, MYF(0)); + return -1; + } + + if (mysql_file_close(file, MYF(0))) + return -1; + + if (strlen(real_file_name) > FN_REFLEN) + return -1; + + if (!is_valid_log_name(real_file_name, strlen(real_file_name))) + { + sql_print_error("Invalid log file name after expanding symlinks: '%s'", + real_file_name); + return -1; + } + + return mysql_file_open(log_file_key, real_file_name, + open_flags | O_NOFOLLOW, + MYF(MY_WME | ME_WAITTANG)); +} +#endif // _WIN32 + + /* Open a (new) log file. @@ -1564,6 +1636,18 @@ MYF(MY_WME | ME_WAITTANG))) < 0) goto err; +#ifndef _WIN32 + /* Reopen and validate path. */ + if ((log_type_arg == LOG_UNKNOWN || log_type_arg == LOG_NORMAL) && + (file= mysql_file_real_name_reopen(file, +#ifdef HAVE_PSI_INTERFACE + log_file_key, +#endif + open_flags, + log_file_name)) < 0) + goto err; +#endif // _WIN32 + if ((pos= mysql_file_tell(file, MYF(MY_WME))) == MY_FILEPOS_ERROR) { if (my_errno == ESPIPE) diff -Nru mysql-5.6-5.6.31/sql/log_event.cc mysql-5.6-5.6.33/sql/log_event.cc --- mysql-5.6-5.6.31/sql/log_event.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/log_event.cc 2016-08-26 11:22:35.000000000 +0000 @@ -351,7 +351,7 @@ Ignore error code specified on command line. */ -inline int ignored_error_code(int err_code) +int ignored_error_code(int err_code) { #ifdef HAVE_NDB_BINLOG /* @@ -3761,7 +3761,8 @@ if (cmd_can_generate_row_events) { cmd_must_go_to_trx_cache= cmd_must_go_to_trx_cache || using_trans; - if (cmd_must_go_to_trx_cache || stmt_has_updated_trans_table(thd) || + if (cmd_must_go_to_trx_cache || + stmt_has_updated_trans_table(thd->transaction.stmt.ha_list) || thd->lex->is_mixed_stmt_unsafe(thd->in_multi_stmt_transaction_mode(), thd->variables.binlog_direct_non_trans_update, trans_has_updated_trans_table(thd), @@ -11092,6 +11093,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli) { DBUG_ENTER("Rows_log_event::do_apply_event(Relay_log_info*)"); + TABLE *table= NULL; int error= 0; if (opt_bin_log) @@ -11169,22 +11171,30 @@ uint actual_error= thd->get_stmt_da()->sql_errno(); if (thd->is_slave_error || thd->is_fatal_error) { - /* - Error reporting borrowed from Query_log_event with many excessive - simplifications. - We should not honour --slave-skip-errors at this point as we are - having severe errors which should not be skiped. - */ - rli->report(ERROR_LEVEL, actual_error, - "Error executing row event: '%s'", - (actual_error ? thd->get_stmt_da()->message() : - "unexpected success or fatal error")); - thd->is_slave_error= 1; + if (ignored_error_code(actual_error)) + { + if (log_warnings > 1) + rli->report(WARNING_LEVEL, actual_error, + "Error executing row event: '%s'", + (actual_error ? thd->get_stmt_da()->message() : + "unexpected success or fatal error")); + thd->get_stmt_da()->clear_warning_info(thd->query_id); + clear_all_errors(thd, const_cast(rli)); + error= 0; + goto end; + } + else + { + rli->report(ERROR_LEVEL, actual_error, + "Error executing row event: '%s'", + (actual_error ? thd->get_stmt_da()->message() : + "unexpected success or fatal error")); + thd->is_slave_error= 1; + const_cast(rli)->slave_close_thread_tables(thd); + DBUG_RETURN(actual_error); + } } - const_cast(rli)->slave_close_thread_tables(thd); - DBUG_RETURN(actual_error); } - /* When the open and locking succeeded, we check all tables to ensure that they still have the correct type. @@ -11245,13 +11255,18 @@ DBUG_PRINT("debug", ("Table: %s.%s is not compatible with master", ptr->table->s->db.str, ptr->table->s->table_name.str)); - /* - We should not honour --slave-skip-errors at this point as we are - having severe errors which should not be skiped. - */ - thd->is_slave_error= 1; - const_cast(rli)->slave_close_thread_tables(thd); - DBUG_RETURN(ERR_BAD_TABLE_DEF); + if (thd->is_slave_error) + { + const_cast(rli)->slave_close_thread_tables(thd); + DBUG_RETURN(ERR_BAD_TABLE_DEF); + } + else + { + thd->get_stmt_da()->clear_warning_info(thd->query_id); + clear_all_errors(thd, const_cast(rli)); + error= 0; + goto end; + } } DBUG_PRINT("debug", ("Table: %s.%s is compatible with master" " - conv_table: %p", @@ -11292,8 +11307,7 @@ #endif } - TABLE* - table= + table= m_table= const_cast(rli)->m_table_map.get_table(m_table_id); DBUG_PRINT("debug", ("m_table: 0x%lx, m_table_id: %llu", (ulong) m_table, @@ -11526,16 +11540,29 @@ thd->is_slave_error= 1; DBUG_RETURN(error); } - +end: if (get_flags(STMT_END_F)) { if((error= rows_event_stmt_cleanup(rli, thd))) - slave_rows_error_report(ERROR_LEVEL, - thd->is_error() ? 0 : error, - rli, thd, table, - get_type_str(), - const_cast(rli)->get_rpl_log_name(), - (ulong) log_pos); + { + if (table) + slave_rows_error_report(ERROR_LEVEL, + thd->is_error() ? 0 : error, + rli, thd, table, + get_type_str(), + const_cast(rli)->get_rpl_log_name(), + (ulong) log_pos); + else + { + rli->report(ERROR_LEVEL, + thd->is_error() ? thd->get_stmt_da()->sql_errno() : error, + "Error in cleaning up after an event of type:%s; %s; the group" + " log file/position: %s %lu", get_type_str(), + thd->is_error() ? thd->get_stmt_da()->message() : "unexpected error", + const_cast(rli)->get_rpl_log_name(), + (ulong) log_pos); + } + } /* We are at end of the statement (STMT_END_F flag), lets clean the memory which was used from thd's mem_root now. This needs to be done only if we are here in SQL thread context. @@ -11577,6 +11604,11 @@ static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD * thd) { + DBUG_EXECUTE_IF("simulate_rows_event_cleanup_failure", + { + my_error(ER_ERROR_DURING_COMMIT, MYF(0), 1); + return (1); + }); int error; { /* @@ -11633,6 +11665,12 @@ thd->reset_current_stmt_binlog_format_row(); const_cast(rli)->cleanup_context(thd, 0); + + /* + Clean sql_command value + */ + thd->lex->sql_command= SQLCOM_END; + } return error; } @@ -12468,6 +12506,16 @@ if (get_flags(STMT_END_F)) status_var_increment(thd->status_var.com_stat[SQLCOM_INSERT]); + /* + Let storage engines treat this event as an INSERT command. + + Set 'sql_command' as SQLCOM_INSERT after the tables are locked. + When locking the tables, it should be SQLCOM_END. + THD::decide_binlog_format which is called from "lock tables" + assumes that row_events will have 'sql_command' as SQLCOM_END. + */ + thd->lex->sql_command= SQLCOM_INSERT; + /** todo: to introduce a property for the event (handler?) which forces applying the event in the replace (idempotent) fashion. @@ -12972,6 +13020,17 @@ */ if (get_flags(STMT_END_F)) status_var_increment(thd->status_var.com_stat[SQLCOM_DELETE]); + + /* + Let storage engines treat this event as a DELETE command. + + Set 'sql_command' as SQLCOM_UPDATE after the tables are locked. + When locking the tables, it should be SQLCOM_END. + THD::decide_binlog_format which is called from "lock tables" + assumes that row_events will have 'sql_command' as SQLCOM_END. + */ + thd->lex->sql_command= SQLCOM_DELETE; + error= row_operations_scan_and_key_setup(); DBUG_RETURN(error); @@ -13081,6 +13140,17 @@ */ if (get_flags(STMT_END_F)) status_var_increment(thd->status_var.com_stat[SQLCOM_UPDATE]); + + /* + Let storage engines treat this event as an UPDATE command. + + Set 'sql_command' as SQLCOM_UPDATE after the tables are locked. + When locking the tables, it should be SQLCOM_END. + THD::decide_binlog_format which is called from "lock tables" + assumes that row_events will have 'sql_command' as SQLCOM_END. + */ + thd->lex->sql_command= SQLCOM_UPDATE; + error= row_operations_scan_and_key_setup(); DBUG_RETURN(error); diff -Nru mysql-5.6-5.6.31/sql/log_event.h mysql-5.6-5.6.33/sql/log_event.h --- mysql-5.6-5.6.31/sql/log_event.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/log_event.h 2016-08-26 11:22:35.000000000 +0000 @@ -53,7 +53,9 @@ class String; typedef ulonglong sql_mode_t; typedef struct st_db_worker_hash_entry db_worker_hash_entry; - +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) +int ignored_error_code(int err_code); +#endif #define PREFIX_SQL_LOAD "SQL_LOAD-" /** diff -Nru mysql-5.6-5.6.31/sql/log.h mysql-5.6-5.6.33/sql/log.h --- mysql-5.6-5.6.31/sql/log.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/log.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -578,6 +578,16 @@ char *make_log_name(char *buff, const char *name, const char* log_ext); +/** + Check given log name against certain blacklisted names/extensions. + + @param name Log name to check + @param len Length of log name + + @returns true if name is valid, false otherwise. +*/ +bool is_valid_log_name(const char *name, size_t len); + extern LOGGER logger; #endif /* LOG_H */ diff -Nru mysql-5.6-5.6.31/sql/mysqld.cc mysql-5.6-5.6.33/sql/mysqld.cc --- mysql-5.6-5.6.31/sql/mysqld.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/mysqld.cc 2016-08-26 11:22:35.000000000 +0000 @@ -4111,6 +4111,22 @@ if (!opt_slow_logname || !*opt_slow_logname) opt_slow_logname= make_default_log_name(slow_logname_path, "-slow.log"); + if (opt_logname && + !is_valid_log_name(opt_logname, strlen(opt_logname))) + { + sql_print_error("Invalid value for --general_log_file: %s", + opt_logname); + return 1; + } + + if (opt_slow_logname && + !is_valid_log_name(opt_slow_logname, strlen(opt_slow_logname))) + { + sql_print_error("Invalid value for --slow_query_log_file: %s", + opt_slow_logname); + return 1; + } + #if defined(ENABLED_DEBUG_SYNC) /* Initialize the debug sync facility. See debug_sync.cc. */ if (debug_sync_init()) @@ -4524,7 +4540,7 @@ /* load_defaults require argv[0] is not null */ char **argv= &name; int argc= 1; - if (!check_file_permissions(fname)) + if (!check_file_permissions(fname, false)) { /* Found a world writable file hence removing it as it is dangerous to write @@ -4555,6 +4571,24 @@ sql_print_error("The server_uuid stored in auto.cnf file is not a valid UUID."); goto err; } + /* + Uuid::is_valid() cannot do strict check on the length as it will be + called by GTID::is_valid() as well (GTID = UUID:seq_no). We should + explicitly add the *length check* here in this function. + + If UUID length is less than '36' (UUID_LENGTH), that error case would have + got caught in above is_valid check. The below check is to make sure that + length is not greater than UUID_LENGTH i.e., there are no extra characters + (Garbage) at the end of the valid UUID. + */ + if (strlen(uuid) > UUID_LENGTH) + { + sql_print_error("Garbage characters found at the end of the server_uuid " + "value in auto.cnf file. It should be of length '%d' " + "(UUID_LENGTH). Clear it and restart the server. ", + UUID_LENGTH); + goto err; + } strcpy(server_uuid, uuid); } else @@ -8400,6 +8434,7 @@ break; case 'b': strmake(mysql_home,argument,sizeof(mysql_home)-1); + mysql_home_ptr= mysql_home; break; case 'C': if (default_collation_name == compiled_default_collation_name) diff -Nru mysql-5.6-5.6.31/sql/net_serv.cc mysql-5.6-5.6.33/sql/net_serv.cc --- mysql-5.6-5.6.31/sql/net_serv.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/net_serv.cc 2016-08-26 11:22:35.000000000 +0000 @@ -242,17 +242,15 @@ { my_bool retry; -#if !defined(MYSQL_SERVER) && defined(THREAD_SAFE_CLIENT) +#ifndef MYSQL_SERVER /* - In the thread safe client library, interrupted I/O operations - are always retried. Otherwise, its either a timeout or a - unrecoverable error. + In the client library, interrupted I/O operations are always retried. + Otherwise, it's either a timeout or an unrecoverable error. */ retry= vio_should_retry(net->vio); #else /* - In the non-thread safe client library, or in the server, - interrupted I/O operations are retried up to a limit. + In the server, interrupted I/O operations are retried up to a limit. In this scenario, pthread_kill can be used to wake up (interrupt) threads waiting for I/O. */ diff -Nru mysql-5.6-5.6.31/sql/rpl_master.cc mysql-5.6-5.6.33/sql/rpl_master.cc --- mysql-5.6-5.6.31/sql/rpl_master.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/rpl_master.cc 2016-08-26 11:22:35.000000000 +0000 @@ -738,7 +738,6 @@ { DBUG_ENTER("com_binlog_dump"); ulong pos; - String slave_uuid; ushort flags= 0; const uchar* packet_position= (uchar *) packet; uint packet_bytes_todo= packet_length; @@ -759,8 +758,7 @@ DBUG_PRINT("info", ("pos=%lu flags=%d server_id=%d", pos, flags, thd->server_id)); - get_slave_uuid(thd, &slave_uuid); - kill_zombie_dump_threads(&slave_uuid); + kill_zombie_dump_threads(thd); general_log_print(thd, thd->get_command(), "Log: '%s' Pos: %ld", packet + 10, (long) pos); @@ -783,7 +781,6 @@ Before going GA, we need to make this protocol extensible without breaking compatitibilty. /Alfranio. */ - String slave_uuid; ushort flags= 0; uint32 data_size= 0; uint64 pos= 0; @@ -815,8 +812,7 @@ DBUG_PRINT("info", ("Slave %d requested to read %s at position %llu gtid set " "'%s'.", thd->server_id, name, pos, gtid_string)); - get_slave_uuid(thd, &slave_uuid); - kill_zombie_dump_threads(&slave_uuid); + kill_zombie_dump_threads(thd); general_log_print(thd, thd->get_command(), "Log: '%s' Pos: %llu GTIDs: '%s'", name, pos, gtid_string); my_free(gtid_string); @@ -888,7 +884,7 @@ Diagnostics_area temp_da; Diagnostics_area *saved_da= thd->get_stmt_da(); thd->set_stmt_da(&temp_da); - bool was_killed_by_duplicate_slave_uuid= false; + bool was_killed_by_duplicate_slave_id= false; DBUG_ENTER("mysql_binlog_send"); DBUG_PRINT("enter",("log_ident: '%s' pos: %ld", log_ident, (long) pos)); @@ -1960,11 +1956,11 @@ reconnect anymore. */ mysql_mutex_lock(&thd->LOCK_thd_data); - was_killed_by_duplicate_slave_uuid= thd->duplicate_slave_uuid; + was_killed_by_duplicate_slave_id= thd->duplicate_slave_id; mysql_mutex_unlock(&thd->LOCK_thd_data); - if (was_killed_by_duplicate_slave_uuid) + if (was_killed_by_duplicate_slave_id) { - errmsg= "A slave with the same server_uuid as this slave " + errmsg= "A slave with the same server_uuid/server_id as this slave " "has connected to the master"; my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG; goto err; @@ -2056,41 +2052,58 @@ /* Kill all Binlog_dump threads which previously talked to the same slave - ("same" means with the same server id). Indeed, if the slave stops, if the + ("same" means with the same UUID(for slave versions >= 5.6) or same server id + (for slave versions < 5.6). Indeed, if the slave stops, if the Binlog_dump thread is waiting (mysql_cond_wait) for binlog update, then it will keep existing until a query is written to the binlog. If the master is idle, then this could last long, and if the slave reconnects, we could have 2 Binlog_dump threads in SHOW PROCESSLIST, until a query is written to the binlog. To avoid this, when the slave reconnects and sends COM_BINLOG_DUMP, - the master kills any existing thread with the slave's server id (if this id is + the master kills any existing thread with the slave's UUID/server id (if this id is not zero; it will be true for real slaves, but false for mysqlbinlog when it sends COM_BINLOG_DUMP to get a remote binlog dump). SYNOPSIS kill_zombie_dump_threads() - slave_uuid the slave's UUID + @param thd newly connected dump thread object */ - -void kill_zombie_dump_threads(String *slave_uuid) +void kill_zombie_dump_threads(THD *thd) { - if (slave_uuid->length() == 0) + String slave_uuid; + get_slave_uuid(thd, &slave_uuid); + if (slave_uuid.length() == 0 && thd->server_id == 0) return; - DBUG_ASSERT(slave_uuid->length() == UUID_LENGTH); mysql_mutex_lock(&LOCK_thread_count); THD *tmp= NULL; Thread_iterator it= global_thread_list_begin(); Thread_iterator end= global_thread_list_end(); + bool is_zombie_thread= false; for (; it != end; ++it) { - if ((*it) != current_thd && ((*it)->get_command() == COM_BINLOG_DUMP || - (*it)->get_command() == COM_BINLOG_DUMP_GTID)) + if ((*it) != thd && ((*it)->get_command() == COM_BINLOG_DUMP || + (*it)->get_command() == COM_BINLOG_DUMP_GTID)) { String tmp_uuid; - if (get_slave_uuid((*it), &tmp_uuid) != NULL && - !strncmp(slave_uuid->c_ptr(), tmp_uuid.c_ptr(), UUID_LENGTH)) + get_slave_uuid((*it), &tmp_uuid); + if (slave_uuid.length()) + { + is_zombie_thread= (tmp_uuid.length() && + !strncmp(slave_uuid.c_ptr(), + tmp_uuid.c_ptr(), UUID_LENGTH)); + } + else + { + /* + Check if it is a 5.5 slave's dump thread i.e., server_id should be + same && dump thread should not contain 'UUID'. + */ + is_zombie_thread= (((*it)->server_id == thd->server_id) && + !tmp_uuid.length()); + } + if (is_zombie_thread) { tmp= *it; mysql_mutex_lock(&tmp->LOCK_thd_data); // Lock from delete @@ -2107,17 +2120,30 @@ again. We just to do kill the thread ourselves. */ if (log_warnings > 1) - sql_print_information("While initializing dump thread for slave with " - "UUID <%s>, found a zombie dump thread with " - "the same UUID. Master is killing the zombie dump " - "thread(%lu).", slave_uuid->c_ptr(), tmp->thread_id); - tmp->duplicate_slave_uuid= true; + { + if (slave_uuid.length()) + { + sql_print_information("While initializing dump thread for slave with " + "UUID <%s>, found a zombie dump thread with the " + "same UUID. Master is killing the zombie dump " + "thread(%lu).", slave_uuid.c_ptr(), + tmp->thread_id); + } + else + { + sql_print_information("While initializing dump thread for slave with " + "server_id <%u>, found a zombie dump thread with the " + "same server_id. Master is killing the zombie dump " + "thread(%lu).", thd->server_id, + tmp->thread_id); + } + } + tmp->duplicate_slave_id= true; tmp->awake(THD::KILL_QUERY); mysql_mutex_unlock(&tmp->LOCK_thd_data); } } - /** Execute a RESET MASTER statement. diff -Nru mysql-5.6-5.6.31/sql/rpl_master.h mysql-5.6-5.6.33/sql/rpl_master.h --- mysql-5.6-5.6.31/sql/rpl_master.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/rpl_master.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef RPL_MASTER_H_INCLUDED -/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ String *get_slave_uuid(THD *thd, String *value); bool show_master_status(THD* thd); bool show_binlogs(THD* thd); -void kill_zombie_dump_threads(String *slave_uuid); +void kill_zombie_dump_threads(THD* thd); /** Process a COM_BINLOG_DUMP_GTID packet. diff -Nru mysql-5.6-5.6.31/sql/rpl_slave.cc mysql-5.6-5.6.33/sql/rpl_slave.cc --- mysql-5.6-5.6.31/sql/rpl_slave.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/rpl_slave.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1945,6 +1945,7 @@ { char query[256]; int ret= 0; + DBUG_EXECUTE_IF("fake_5_5_version_slave", return ret;); sprintf(query, "SET @slave_uuid= '%s'", server_uuid); if (mysql_real_query(mysql, query, strlen(query)) @@ -8313,6 +8314,7 @@ (memcmp(fixed_in, master_ver, 3) > 0) && (pred == NULL || (*pred)(param))) { + enum loglevel report_level= INFORMATION_LEVEL; if (!report) return TRUE; // a short message for SHOW SLAVE STATUS (message length constraints) @@ -8321,25 +8323,35 @@ " so slave stops; check error log on slave" " for more info", MYF(0), bug_id); // a verbose message for the error log - rli->report(ERROR_LEVEL, ER_UNKNOWN_ERROR, - "According to the master's version ('%s')," - " it is probable that master suffers from this bug:" - " http://bugs.mysql.com/bug.php?id=%u" - " and thus replicating the current binary log event" - " may make the slave's data become different from the" - " master's data." - " To take no risk, slave refuses to replicate" - " this event and stops." - " We recommend that all updates be stopped on the" - " master and slave, that the data of both be" - " manually synchronized," - " that master's binary logs be deleted," - " that master be upgraded to a version at least" - " equal to '%d.%d.%d'. Then replication can be" - " restarted.", - rli->get_rli_description_event()->server_version, - bug_id, - fixed_in[0], fixed_in[1], fixed_in[2]); + if (!ignored_error_code(ER_UNKNOWN_ERROR)) + { + report_level= ERROR_LEVEL; + current_thd->is_slave_error= 1; + } + /* In case of ignored errors report warnings only if log_warnings > 1. */ + else if (log_warnings > 1) + report_level= WARNING_LEVEL; + + if (report_level != INFORMATION_LEVEL) + rli->report(report_level, ER_UNKNOWN_ERROR, + "According to the master's version ('%s')," + " it is probable that master suffers from this bug:" + " http://bugs.mysql.com/bug.php?id=%u" + " and thus replicating the current binary log event" + " may make the slave's data become different from the" + " master's data." + " To take no risk, slave refuses to replicate" + " this event and stops." + " We recommend that all updates be stopped on the" + " master and slave, that the data of both be" + " manually synchronized," + " that master's binary logs be deleted," + " that master be upgraded to a version at least" + " equal to '%d.%d.%d'. Then replication can be" + " restarted.", + rli->get_rli_description_event()->server_version, + bug_id, + fixed_in[0], fixed_in[1], fixed_in[2]); return TRUE; } } diff -Nru mysql-5.6-5.6.31/sql/rpl_utility.cc mysql-5.6-5.6.33/sql/rpl_utility.cc --- mysql-5.6-5.6.31/sql/rpl_utility.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/rpl_utility.cc 2016-08-26 11:22:35.000000000 +0000 @@ -350,7 +350,7 @@ return length; } -#ifndef MYSQL_CLIENT +#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) /** */ static void show_sql_type(enum_field_types type, uint16 metadata, String *str, @@ -916,14 +916,26 @@ const char *tbl_name= table->s->table_name.str; char source_buf[MAX_FIELD_WIDTH]; char target_buf[MAX_FIELD_WIDTH]; + enum loglevel report_level= INFORMATION_LEVEL; + String source_type(source_buf, sizeof(source_buf), &my_charset_latin1); String target_type(target_buf, sizeof(target_buf), &my_charset_latin1); show_sql_type(type(col), field_metadata(col), &source_type, field->charset()); field->sql_type(target_type); - rli->report(ERROR_LEVEL, ER_SLAVE_CONVERSION_FAILED, - ER(ER_SLAVE_CONVERSION_FAILED), - col, db_name, tbl_name, - source_type.c_ptr_safe(), target_type.c_ptr_safe()); + if (!ignored_error_code(ER_SLAVE_CONVERSION_FAILED)) + { + report_level= ERROR_LEVEL; + thd->is_slave_error= 1; + } + /* In case of ignored errors report warnings only if log_warnings > 1. */ + else if (log_warnings > 1) + report_level= WARNING_LEVEL; + + if (report_level != INFORMATION_LEVEL) + rli->report(report_level, ER_SLAVE_CONVERSION_FAILED, + ER(ER_SLAVE_CONVERSION_FAILED), + col, db_name, tbl_name, + source_type.c_ptr_safe(), target_type.c_ptr_safe()); return false; } } @@ -1061,10 +1073,23 @@ err: if (conv_table == NULL) - rli->report(ERROR_LEVEL, ER_SLAVE_CANT_CREATE_CONVERSION, - ER(ER_SLAVE_CANT_CREATE_CONVERSION), - target_table->s->db.str, - target_table->s->table_name.str); + { + enum loglevel report_level= INFORMATION_LEVEL; + if (!ignored_error_code(ER_SLAVE_CANT_CREATE_CONVERSION)) + { + report_level= ERROR_LEVEL; + thd->is_slave_error= 1; + } + /* In case of ignored errors report warnings only if log_warnings > 1. */ + else if (log_warnings > 1) + report_level= WARNING_LEVEL; + + if (report_level != INFORMATION_LEVEL) + rli->report(report_level, ER_SLAVE_CANT_CREATE_CONVERSION, + ER(ER_SLAVE_CANT_CREATE_CONVERSION), + target_table->s->db.str, + target_table->s->table_name.str); + } DBUG_RETURN(conv_table); } diff -Nru mysql-5.6-5.6.31/sql/sql_acl.cc mysql-5.6-5.6.33/sql/sql_acl.cc --- mysql-5.6-5.6.31/sql/sql_acl.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_acl.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. - +sql_authenticate This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. @@ -11051,6 +11051,27 @@ } /** + Assign priv_user and priv_host fields of the Security_context. + + @param sctx Security context, which priv_user and priv_host fields are + updated. + @param user Authenticated user data. +*/ +inline void +assign_priv_user_host(Security_context *sctx, const ACL_USER *user) +{ + if (user->user) + strmake(sctx->priv_user, user->user, USERNAME_LENGTH - 1); + else + *sctx->priv_user= 0; + + if (user->host.get_host()) + strmake(sctx->priv_host, user->host.get_host(), MAX_HOSTNAME - 1); + else + *sctx->priv_host= 0; +} + +/** Perform the handshake, authorize the client and update thd sctx variables. @param thd thread handle @@ -11177,6 +11198,9 @@ res= CR_ERROR; } + if (mpvio.can_authenticate()) + assign_priv_user_host(sctx, acl_user); + if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS) { Host_errors errors; @@ -11259,15 +11283,7 @@ #endif sctx->master_access= acl_user->access; - if (acl_user->user) - strmake(sctx->priv_user, acl_user->user, USERNAME_LENGTH - 1); - else - *sctx->priv_user= 0; - - if (acl_user->host.get_host()) - strmake(sctx->priv_host, acl_user->host.get_host(), MAX_HOSTNAME - 1); - else - *sctx->priv_host= 0; + assign_priv_user_host(sctx, acl_user); #ifndef NO_EMBEDDED_ACCESS_CHECKS /* diff -Nru mysql-5.6-5.6.31/sql/sql_base.cc mysql-5.6-5.6.33/sql/sql_base.cc --- mysql-5.6-5.6.31/sql/sql_base.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_base.cc 2016-08-26 11:22:35.000000000 +0000 @@ -5462,6 +5462,15 @@ &table_list->view->sroutines_list, table_list->top_table()); } + + /* + If a trigger was defined on one of the associated tables then assign the + 'trg_event_map' value of the view to the next table in table_list. When a + Stored function is invoked, all the associated tables including the tables + associated with the trigger are prelocked. + */ + if (table_list->trg_event_map && table_list->next_global) + table_list->next_global->trg_event_map= table_list->trg_event_map; return FALSE; } diff -Nru mysql-5.6-5.6.31/sql/sql_class.cc mysql-5.6-5.6.33/sql/sql_class.cc --- mysql-5.6-5.6.31/sql/sql_class.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_class.cc 2016-08-26 11:22:35.000000000 +0000 @@ -928,7 +928,7 @@ owned_gtid_set(global_sid_map), main_da(0, false), m_stmt_da(&main_da), - duplicate_slave_uuid(false) + duplicate_slave_id(false) { ulong tmp; diff -Nru mysql-5.6-5.6.31/sql/sql_class.h mysql-5.6-5.6.33/sql/sql_class.h --- mysql-5.6-5.6.31/sql/sql_class.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_class.h 2016-08-26 11:22:35.000000000 +0000 @@ -1562,6 +1562,8 @@ /** Type of locked tables mode. See comment for THD::locked_tables_mode for complete description. + While adding new enum values add them to the getter method for this enum + declared below and defined in sql_class.cc as well. */ enum enum_locked_tables_mode @@ -1572,6 +1574,15 @@ LTM_PRELOCKED_UNDER_LOCK_TABLES }; +#ifndef DBUG_OFF +/** + Getter for the enum enum_locked_tables_mode + @param locked_tables_mode enum for types of locked tables mode + + @return The string represantation of that enum value +*/ +const char * get_locked_tables_mode_name(enum_locked_tables_mode locked_tables_mode); +#endif /** Class that holds information about tables which were opened and locked @@ -4148,11 +4159,12 @@ public: /** This is only used by master dump threads. - When the master receives a new connection from a slave with a UUID that - is already connected, it will set this flag TRUE before killing the old - slave connection. + When the master receives a new connection from a slave with a + UUID (for slave versions >= 5.6)/server_id(for slave versions < 5.6) + that is already connected, it will set this flag TRUE + before killing the old slave connection. */ - bool duplicate_slave_uuid; + bool duplicate_slave_id; }; diff -Nru mysql-5.6-5.6.31/sql/sql_lex.cc mysql-5.6-5.6.33/sql/sql_lex.cc --- mysql-5.6-5.6.31/sql/sql_lex.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_lex.cc 2016-08-26 11:22:35.000000000 +0000 @@ -3569,6 +3569,9 @@ if (query_tables_last == &first_table->next_global) query_tables_last= first_table->prev_global; + if (query_tables_own_last == &first_table->next_global) + query_tables_own_last= first_table->prev_global; + if ((next= *first_table->prev_global= first_table->next_global)) next->prev_global= first_table->prev_global; /* include in new place */ diff -Nru mysql-5.6-5.6.31/sql/sql_load.cc mysql-5.6-5.6.33/sql/sql_load.cc --- mysql-5.6-5.6.31/sql/sql_load.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_load.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1413,8 +1413,8 @@ set_if_bigger(length,line_start.length()); stack=stack_pos=(int*) sql_alloc(sizeof(int)*length); - if (!(buffer=(uchar*) my_malloc(buff_length+1,MYF(0)))) - error=1; /* purecov: inspected */ + if (!(buffer=(uchar*) my_malloc(buff_length+1,MYF(MY_WME)))) + error= true; /* purecov: inspected */ else { end_of_buff=buffer+buff_length; @@ -1607,37 +1607,50 @@ } } #ifdef USE_MB - if (my_mbcharlen(read_charset, chr) > 1 && - to + my_mbcharlen(read_charset, chr) <= end_of_buff) - { - uchar* p= to; - int ml, i; - *to++ = chr; - - ml= my_mbcharlen(read_charset, chr); + uint ml= my_mbcharlen(read_charset, chr); + if (ml == 0) + { + *to= '\0'; + my_error(ER_INVALID_CHARACTER_STRING, MYF(0), + read_charset->csname, buffer); + error= true; + return 1; + } - for (i= 1; i < ml; i++) + if (ml > 1 && + to + ml <= end_of_buff) { - chr= GET; - if (chr == my_b_EOF) + uchar* p= to; + *to++ = chr; + + for (uint i= 1; i < ml; i++) { - /* - Need to back up the bytes already ready from illformed - multi-byte char - */ - to-= i; - goto found_eof; + chr= GET; + if (chr == my_b_EOF) + { + /* + Need to back up the bytes already ready from illformed + multi-byte char + */ + to-= i; + goto found_eof; + } + *to++ = chr; } - *to++ = chr; - } - if (my_ismbchar(read_charset, + if (my_ismbchar(read_charset, (const char *)p, (const char *)to)) - continue; - for (i= 0; i < ml; i++) - PUSH(*--to); - chr= GET; - } + continue; + for (uint i= 0; i < ml; i++) + PUSH(*--to); + chr= GET; + } + else if (ml > 1) + { + // Buffer is too small, exit while loop, and reallocate. + PUSH(chr); + break; + } #endif *to++ = (uchar) chr; } @@ -1886,7 +1899,15 @@ for (chr= GET; my_tospace(chr) != delim && chr != my_b_EOF;) { #ifdef USE_MB - if (my_mbcharlen(read_charset, chr) > 1) + uint ml= my_mbcharlen(read_charset, chr); + if (ml == 0) + { + chr= my_b_EOF; + val->length(0); + return chr; + } + + if (ml > 1) { DBUG_PRINT("read_xml",("multi byte")); int i, ml= my_mbcharlen(read_charset, chr); diff -Nru mysql-5.6-5.6.31/sql/sql_prepare.cc mysql-5.6-5.6.33/sql/sql_prepare.cc --- mysql-5.6-5.6.31/sql/sql_prepare.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_prepare.cc 2016-08-26 11:22:35.000000000 +0000 @@ -4010,7 +4010,10 @@ /* Go! */ if (open_cursor) + { + lex->safe_to_cache_query= 0; error= mysql_open_cursor(thd, &result, &cursor); + } else { /* diff -Nru mysql-5.6-5.6.31/sql/sql_tmp_table.cc mysql-5.6-5.6.33/sql/sql_tmp_table.cc --- mysql-5.6-5.6.31/sql/sql_tmp_table.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_tmp_table.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -359,6 +359,7 @@ case Item::REF_ITEM: case Item::NULL_ITEM: case Item::VARBIN_ITEM: + case Item::PARAM_ITEM: if (make_copy_field) { DBUG_ASSERT(((Item_result_field*)item)->result_field); diff -Nru mysql-5.6-5.6.31/sql/sql_update.cc mysql-5.6-5.6.33/sql/sql_update.cc --- mysql-5.6-5.6.31/sql/sql_update.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_update.cc 2016-08-26 11:22:35.000000000 +0000 @@ -452,7 +452,7 @@ /* Update the table->file->stats.records number */ table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); - table->mark_columns_needed_for_update(); + table->mark_columns_needed_for_update(false/*mark_binlog_columns=false*/); select= make_select(table, 0, 0, conds, 0, &error); { // Enter scope for optimizer trace wrapper @@ -530,7 +530,7 @@ #ifdef WITH_PARTITION_STORAGE_ENGINE used_key_is_modified|= partition_key_modified(table, table->write_set); #endif - + table->mark_columns_per_binlog_row_image(); using_filesort= order && (need_sort||used_key_is_modified); if (thd->lex->describe) { @@ -1859,12 +1859,12 @@ { if (safe_update_on_fly(thd, join->join_tab, table_ref, all_tables)) { - table->mark_columns_needed_for_update(); + table->mark_columns_needed_for_update(true/*mark_binlog_columns=true*/); table_to_update= table; // Update table on the fly continue; } } - table->mark_columns_needed_for_update(); + table->mark_columns_needed_for_update(true/*mark_binlog_columns=true*/); /* enable uncacheable flag if we update a view with check option diff -Nru mysql-5.6-5.6.31/sql/sql_yacc.cc mysql-5.6-5.6.33/sql/sql_yacc.cc --- mysql-5.6-5.6.31/sql/sql_yacc.cc 2016-05-16 22:26:24.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_yacc.cc 2016-08-26 11:33:03.000000000 +0000 @@ -70,7 +70,7 @@ /* Copy the first part of user declarations. */ /* Line 371 of yacc.c */ -#line 24 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 24 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" /* Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex(). @@ -1016,7 +1016,7 @@ /* Line 371 of yacc.c */ -#line 1020 "/export/home/pb2/build/sb_0-18927995-1463437275.62/dist_GPL/sql/sql_yacc.cc" +#line 1020 "/export/home/pb2/build/sb_0-20199989-1472210623.26/dist_GPL/sql/sql_yacc.cc" # ifndef YY_NULL # if defined __cplusplus && 201103L <= __cplusplus @@ -1036,8 +1036,8 @@ /* In a future release of Bison, this section will be replaced by #include "sql_yacc.h". */ -#ifndef YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED -# define YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED +#ifndef YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED +# define YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -2298,7 +2298,7 @@ typedef union YYSTYPE { /* Line 387 of yacc.c */ -#line 968 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 968 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" int num; ulong ulong_num; @@ -2358,7 +2358,7 @@ /* Line 387 of yacc.c */ -#line 2362 "/export/home/pb2/build/sb_0-18927995-1463437275.62/dist_GPL/sql/sql_yacc.cc" +#line 2362 "/export/home/pb2/build/sb_0-20199989-1472210623.26/dist_GPL/sql/sql_yacc.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -2380,16 +2380,16 @@ #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED */ +#endif /* !YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED */ /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 1026 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 1026 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); /* Line 390 of yacc.c */ -#line 2393 "/export/home/pb2/build/sb_0-18927995-1463437275.62/dist_GPL/sql/sql_yacc.cc" +#line 2393 "/export/home/pb2/build/sb_0-20199989-1472210623.26/dist_GPL/sql/sql_yacc.cc" #ifdef short # undef short @@ -3791,261 +3791,261 @@ 2326, 2333, 2336, 2338, 2339, 2343, 2357, 2361, 2377, 2381, 2394, 2393, 2439, 2444, 2438, 2451, 2456, 2449, 2463, 2468, 2461, 2474, 2473, 2486, 2485, 2493, 2497, 2501, 2505, 2512, - 2525, 2526, 2530, 2534, 2538, 2542, 2546, 2551, 2555, 2563, - 2562, 2594, 2593, 2600, 2607, 2608, 2614, 2620, 2630, 2636, - 2642, 2644, 2651, 2652, 2656, 2662, 2671, 2672, 2680, 2680, - 2735, 2736, 2737, 2738, 2739, 2740, 2741, 2742, 2743, 2744, - 2745, 2746, 2747, 2752, 2766, 2780, 2799, 2800, 2804, 2805, - 2810, 2812, 2814, 2816, 2818, 2820, 2822, 2828, 2829, 2830, - 2834, 2838, 2846, 2845, 2858, 2860, 2863, 2865, 2869, 2873, - 2880, 2882, 2886, 2887, 2892, 2911, 2941, 2943, 2947, 2948, - 2952, 2981, 2982, 2983, 2984, 2988, 2989, 2993, 2994, 2999, - 3002, 3029, 3028, 3112, 3129, 3128, 3203, 3202, 3275, 3276, - 3281, 3283, 3288, 3311, 3322, 3326, 3348, 3349, 3353, 3357, - 3370, 3376, 3382, 3391, 3406, 3432, 3438, 3439, 3445, 3448, - 3452, 3460, 3480, 3482, 3500, 3506, 3508, 3510, 3512, 3514, - 3516, 3518, 3520, 3522, 3524, 3526, 3528, 3533, 3549, 3565, - 3566, 3571, 3577, 3586, 3592, 3601, 3609, 3638, 3647, 3649, - 3658, 3663, 3669, 3678, 3686, 3688, 3690, 3692, 3694, 3696, - 3698, 3700, 3702, 3704, 3706, 3708, 3710, 3715, 3735, 3759, - 3761, 3760, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, - 3775, 3776, 3777, 3778, 3779, 3784, 3783, 3794, 3794, 3851, - 3850, 3907, 3907, 3929, 3988, 4038, 4063, 4062, 4088, 4111, - 4113, 4114, 4118, 4136, 4157, 4166, 4202, 4157, 4231, 4233, - 4234, 4238, 4239, 4244, 4255, 4243, 4306, 4305, 4319, 4320, - 4324, 4325, 4330, 4339, 4329, 4388, 4397, 4387, 4441, 4454, - 4459, 4458, 4496, 4497, 4502, 4501, 4535, 4535, 4554, 4553, - 4603, 4620, 4629, 4619, 4683, 4692, 4682, 4732, 4734, 4739, - 4741, 4743, 4760, 4765, 4771, 4778, 4779, 4787, 4793, 4802, - 4808, 4814, 4815, 4819, 4819, 4824, 4825, 4826, 4830, 4831, - 4832, 4835, 4837, 4841, 4842, 4843, 4847, 4848, 4849, 4850, - 4851, 4852, 4853, 4854, 4857, 4859, 4863, 4864, 4865, 4869, - 4870, 4871, 4872, 4873, 4876, 4878, 4882, 4883, 4884, 4888, - 4889, 4890, 4891, 4892, 4893, 4894, 4897, 4899, 4903, 4904, - 4905, 4909, 4910, 4911, 4916, 4924, 4932, 4940, 4952, 4964, - 4969, 4974, 4982, 4990, 4998, 5006, 5014, 5022, 5030, 5043, - 5056, 5070, 5075, 5088, 5089, 5140, 5141, 5144, 5159, 5177, - 5182, 5180, 5187, 5189, 5188, 5192, 5191, 5197, 5234, 5235, - 5240, 5239, 5258, 5277, 5276, 5293, 5297, 5305, 5304, 5307, - 5309, 5311, 5313, 5318, 5319, 5325, 5326, 5343, 5344, 5348, - 5349, 5353, 5372, 5382, 5393, 5402, 5403, 5419, 5421, 5420, - 5425, 5423, 5434, 5435, 5439, 5457, 5473, 5474, 5490, 5505, - 5527, 5528, 5533, 5532, 5556, 5566, 5588, 5587, 5605, 5604, - 5624, 5646, 5650, 5679, 5691, 5692, 5697, 5708, 5696, 5733, - 5734, 5738, 5751, 5772, 5785, 5811, 5812, 5817, 5816, 5853, - 5858, 5859, 5863, 5864, 5868, 5870, 5876, 5878, 5880, 5882, - 5884, 5886, 5896, 5911, 5895, 5925, 5926, 5930, 5931, 5935, - 5936, 5940, 5941, 5945, 5946, 5950, 5951, 5955, 5959, 5960, - 5963, 5965, 5969, 5970, 5974, 5975, 5976, 5980, 5985, 5990, - 5995, 6000, 6005, 6010, 6015, 6030, 6036, 6051, 6056, 6071, - 6077, 6095, 6100, 6105, 6110, 6115, 6121, 6120, 6146, 6147, - 6148, 6153, 6158, 6163, 6165, 6167, 6169, 6175, 6183, 6201, - 6218, 6244, 6262, 6263, 6264, 6265, 6266, 6267, 6271, 6272, - 6273, 6277, 6278, 6282, 6283, 6284, 6285, 6290, 6297, 6298, - 6302, 6303, 6307, 6308, 6315, 6320, 6326, 6332, 6338, 6357, - 6363, 6365, 6369, 6373, 6374, 6378, 6383, 6382, 6405, 6406, - 6407, 6408, 6413, 6417, 6422, 6427, 6431, 6436, 6441, 6447, - 6452, 6458, 6462, 6467, 6472, 6490, 6492, 6494, 6510, 6512, - 6517, 6522, 6534, 6539, 6544, 6549, 6551, 6553, 6555, 6557, - 6559, 6561, 6563, 6566, 6565, 6570, 6569, 6573, 6575, 6584, - 6585, 6586, 6592, 6593, 6594, 6595, 6596, 6600, 6604, 6605, - 6609, 6610, 6614, 6615, 6616, 6617, 6618, 6622, 6623, 6624, - 6625, 6626, 6630, 6635, 6637, 6643, 6644, 6646, 6651, 6661, - 6662, 6666, 6667, 6668, 6676, 6677, 6681, 6682, 6686, 6687, - 6688, 6692, 6693, 6694, 6695, 6698, 6699, 6703, 6704, 6708, - 6709, 6713, 6714, 6718, 6719, 6720, 6721, 6722, 6723, 6729, - 6735, 6741, 6747, 6748, 6761, 6767, 6773, 6779, 6784, 6789, - 6798, 6819, 6827, 6828, 6833, 6834, 6838, 6846, 6850, 6851, - 6855, 6856, 6860, 6869, 6873, 6874, 6878, 6886, 6887, 6891, - 6892, 6896, 6897, 6902, 6903, 6907, 6914, 6923, 6928, 6936, - 6937, 6938, 6939, 6940, 6941, 6946, 6954, 6955, 6960, 6959, - 6972, 6973, 6977, 6980, 6981, 6982, 6983, 6987, 6995, 7002, - 7003, 7007, 7017, 7018, 7022, 7023, 7026, 7028, 7032, 7044, - 7045, 7049, 7056, 7069, 7070, 7072, 7074, 7080, 7085, 7091, - 7097, 7104, 7114, 7115, 7116, 7117, 7118, 7122, 7126, 7127, - 7131, 7132, 7136, 7137, 7141, 7142, 7143, 7147, 7148, 7152, - 7156, 7169, 7181, 7182, 7186, 7187, 7191, 7192, 7196, 7197, - 7201, 7202, 7206, 7207, 7211, 7212, 7216, 7217, 7221, 7223, - 7227, 7228, 7232, 7236, 7237, 7250, 7251, 7252, 7256, 7257, - 7261, 7267, 7281, 7282, 7286, 7287, 7291, 7292, 7300, 7299, - 7345, 7344, 7358, 7370, 7369, 7388, 7387, 7406, 7405, 7424, - 7418, 7438, 7437, 7470, 7475, 7480, 7485, 7490, 7497, 7504, - 7509, 7517, 7518, 7519, 7520, 7524, 7525, 7537, 7538, 7542, - 7543, 7546, 7548, 7556, 7564, 7566, 7568, 7569, 7577, 7578, - 7582, 7591, 7589, 7603, 7617, 7616, 7630, 7628, 7642, 7649, - 7660, 7661, 7689, 7696, 7700, 7705, 7704, 7720, 7722, 7727, - 7735, 7734, 7750, 7754, 7753, 7765, 7766, 7770, 7785, 7786, - 7790, 7799, 7803, 7808, 7814, 7813, 7824, 7833, 7823, 7848, - 7857, 7866, 7875, 7884, 7890, 7896, 7905, 7914, 7942, 7963, - 7973, 7977, 7982, 7983, 7986, 7988, 7989, 7990, 7991, 7994, - 7999, 8010, 8015, 8026, 8027, 8031, 8032, 8036, 8037, 8038, - 8042, 8043, 8048, 8056, 8057, 8058, 8059, 8064, 8063, 8092, - 8102, 8119, 8122, 8129, 8133, 8140, 8144, 8148, 8155, 8160, - 8163, 8170, 8173, 8180, 8183, 8190, 8193, 8201, 8204, 8211, - 8215, 8222, 8226, 8233, 8234, 8259, 8260, 8261, 8266, 8271, - 8279, 8278, 8290, 8291, 8292, 8297, 8296, 8318, 8319, 8323, - 8324, 8328, 8329, 8330, 8335, 8334, 8356, 8365, 8364, 8391, - 8392, 8396, 8397, 8401, 8402, 8403, 8404, 8405, 8406, 8411, - 8410, 8432, 8433, 8434, 8439, 8438, 8444, 8451, 8456, 8464, - 8465, 8469, 8483, 8482, 8495, 8496, 8500, 8501, 8505, 8515, - 8525, 8526, 8531, 8530, 8541, 8542, 8546, 8547, 8551, 8561, - 8572, 8571, 8579, 8579, 8590, 8591, 8596, 8597, 8606, 8615, - 8616, 8620, 8625, 8630, 8635, 8640, 8639, 8659, 8667, 8659, - 8674, 8675, 8676, 8677, 8678, 8682, 8689, 8696, 8698, 8709, - 8710, 8714, 8715, 8743, 8773, 8775, 8784, 8797, 8798, 8799, - 8814, 8821, 8846, 8852, 8858, 8859, 8860, 8861, 8862, 8866, - 8867, 8872, 8923, 8930, 8973, 8979, 8985, 8991, 8997, 9003, - 9009, 9015, 9019, 9025, 9031, 9037, 9043, 9049, 9053, 9059, - 9069, 9075, 9083, 9089, 9099, 9105, 9114, 9124, 9130, 9140, - 9146, 9155, 9159, 9165, 9171, 9177, 9183, 9189, 9195, 9201, - 9207, 9213, 9219, 9225, 9231, 9237, 9243, 9247, 9248, 9252, - 9253, 9257, 9258, 9262, 9263, 9267, 9268, 9269, 9270, 9271, - 9272, 9276, 9277, 9281, 9282, 9283, 9284, 9285, 9286, 9298, - 9299, 9300, 9301, 9302, 9308, 9312, 9318, 9324, 9330, 9336, - 9338, 9345, 9352, 9358, 9399, 9408, 9415, 9423, 9429, 9436, - 9442, 9456, 9463, 9479, 9485, 9491, 9499, 9505, 9511, 9517, - 9523, 9538, 9550, 9556, 9562, 9568, 9574, 9580, 9586, 9592, - 9598, 9604, 9610, 9616, 9622, 9628, 9634, 9640, 9646, 9654, - 9675, 9682, 9688, 9695, 9702, 9709, 9716, 9722, 9728, 9733, - 9739, 9746, 9752, 9758, 9764, 9770, 9776, 9794, 9800, 9806, - 9813, 9820, 9835, 9841, 9847, 9853, 9859, 9866, 9872, 9878, - 9884, 9890, 9896, 9904, 9917, 9923, 9929, 9935, 9941, 9949, - 9955, 9967, 9973, 9979, 9987, 9997, 10003, 10019, 10025, 10032, - 10039, 10046, 10053, 10060, 10064, 10084, 10083, 10156, 10196, 10198, - 10203, 10204, 10208, 10209, 10213, 10214, 10218, 10225, 10233, 10259, - 10265, 10271, 10277, 10283, 10289, 10298, 10305, 10307, 10304, 10314, - 10325, 10331, 10337, 10343, 10349, 10355, 10361, 10367, 10373, 10380, - 10379, 10399, 10398, 10413, 10424, 10432, 10448, 10449, 10454, 10459, - 10462, 10465, 10464, 10481, 10483, 10489, 10488, 10505, 10507, 10509, - 10511, 10513, 10515, 10517, 10519, 10521, 10523, 10525, 10530, 10531, - 10535, 10542, 10550, 10551, 10555, 10562, 10570, 10571, 10575, 10576, - 10580, 10588, 10599, 10600, 10609, 10620, 10621, 10627, 10628, 10648, - 10650, 10654, 10652, 10669, 10667, 10685, 10683, 10690, 10699, 10697, - 10715, 10714, 10724, 10735, 10733, 10752, 10751, 10762, 10773, 10774, - 10775, 10783, 10784, 10788, 10803, 10803, 10818, 10858, 10931, 10942, - 10947, 10939, 10966, 10986, 10994, 10986, 11003, 11002, 11025, 11042, - 11025, 11049, 11053, 11079, 11080, 11085, 11088, 11089, 11090, 11094, - 11095, 11100, 11099, 11105, 11104, 11112, 11113, 11116, 11118, 11118, - 11122, 11122, 11127, 11128, 11132, 11134, 11139, 11140, 11144, 11155, - 11168, 11169, 11170, 11171, 11172, 11173, 11174, 11175, 11176, 11177, - 11178, 11179, 11183, 11184, 11185, 11186, 11187, 11188, 11189, 11190, - 11191, 11195, 11196, 11197, 11198, 11201, 11203, 11204, 11208, 11209, - 11217, 11219, 11223, 11225, 11224, 11238, 11241, 11240, 11255, 11261, - 11276, 11278, 11282, 11284, 11289, 11290, 11310, 11341, 11345, 11346, - 11350, 11363, 11365, 11370, 11369, 11404, 11406, 11411, 11412, 11413, - 11418, 11424, 11428, 11429, 11433, 11440, 11447, 11454, 11464, 11491, - 11495, 11501, 11507, 11517, 11521, 11531, 11532, 11533, 11534, 11535, - 11536, 11540, 11541, 11542, 11543, 11544, 11548, 11549, 11550, 11551, - 11552, 11556, 11557, 11558, 11559, 11563, 11568, 11569, 11572, 11575, - 11574, 11608, 11609, 11613, 11621, 11634, 11634, 11644, 11645, 11649, - 11668, 11708, 11707, 11720, 11728, 11719, 11730, 11742, 11754, 11753, - 11771, 11770, 11781, 11782, 11781, 11798, 11805, 11826, 11847, 11859, - 11864, 11863, 11873, 11879, 11886, 11891, 11896, 11906, 11907, 11911, - 11922, 11935, 11936, 11940, 11951, 11952, 11956, 11957, 11960, 11962, - 11965, 11966, 11967, 11971, 11972, 11980, 11988, 11979, 11998, 12005, - 11997, 12015, 12027, 12028, 12041, 12045, 12046, 12062, 12063, 12067, - 12076, 12077, 12078, 12080, 12079, 12090, 12091, 12095, 12096, 12098, - 12097, 12101, 12100, 12106, 12107, 12111, 12112, 12116, 12126, 12127, - 12131, 12132, 12137, 12136, 12150, 12151, 12155, 12160, 12168, 12169, - 12177, 12179, 12179, 12187, 12195, 12186, 12217, 12218, 12222, 12230, - 12231, 12235, 12245, 12246, 12253, 12252, 12268, 12267, 12281, 12280, - 12292, 12291, 12305, 12306, 12310, 12323, 12339, 12340, 12344, 12345, - 12349, 12350, 12351, 12356, 12355, 12377, 12379, 12382, 12384, 12387, - 12388, 12391, 12395, 12399, 12403, 12407, 12411, 12415, 12419, 12423, - 12431, 12434, 12444, 12443, 12458, 12465, 12473, 12481, 12489, 12497, - 12505, 12512, 12514, 12516, 12525, 12529, 12534, 12533, 12539, 12538, - 12543, 12552, 12559, 12564, 12566, 12568, 12570, 12572, 12580, 12591, - 12599, 12601, 12609, 12616, 12623, 12633, 12640, 12646, 12655, 12663, - 12667, 12671, 12678, 12685, 12691, 12698, 12705, 12710, 12715, 12723, - 12725, 12727, 12732, 12733, 12736, 12738, 12742, 12743, 12747, 12748, - 12752, 12753, 12757, 12758, 12762, 12763, 12766, 12768, 12775, 12786, - 12785, 12801, 12800, 12807, 12808, 12809, 12810, 12811, 12815, 12816, - 12821, 12825, 12831, 12837, 12859, 12860, 12861, 12876, 12875, 12888, - 12897, 12887, 12899, 12903, 12904, 12916, 12915, 12937, 12938, 12943, - 12945, 12947, 12949, 12951, 12953, 12955, 12957, 12959, 12961, 12963, - 12965, 12967, 12972, 12973, 12978, 12977, 12987, 12988, 12992, 12992, - 12994, 12995, 12999, 13000, 13005, 13004, 13015, 13019, 13023, 13035, - 13045, 13046, 13047, 13053, 13065, 13077, 13087, 13097, 13064, 13105, - 13106, 13110, 13111, 13115, 13116, 13128, 13132, 13133, 13134, 13137, - 13139, 13143, 13144, 13148, 13153, 13160, 13165, 13172, 13174, 13178, - 13179, 13183, 13188, 13196, 13197, 13200, 13202, 13210, 13212, 13216, - 13217, 13218, 13222, 13224, 13229, 13230, 13239, 13240, 13244, 13245, - 13249, 13269, 13293, 13305, 13316, 13335, 13343, 13355, 13370, 13391, - 13392, 13393, 13402, 13403, 13404, 13405, 13420, 13426, 13432, 13438, - 13444, 13475, 13508, 13518, 13528, 13534, 13543, 13555, 13561, 13567, - 13583, 13584, 13588, 13597, 13613, 13617, 13668, 13672, 13690, 13694, - 13774, 13799, 13830, 13831, 13847, 13857, 13861, 13867, 13873, 13883, - 13889, 13898, 13908, 13909, 13939, 13952, 13968, 13984, 14001, 14002, - 14013, 14014, 14025, 14026, 14027, 14031, 14058, 14091, 14106, 14107, - 14108, 14109, 14110, 14111, 14112, 14113, 14114, 14115, 14116, 14117, - 14118, 14119, 14120, 14121, 14122, 14123, 14124, 14125, 14126, 14127, - 14128, 14129, 14130, 14131, 14132, 14133, 14134, 14135, 14136, 14137, - 14138, 14139, 14140, 14141, 14142, 14143, 14144, 14145, 14146, 14147, - 14148, 14149, 14150, 14151, 14152, 14153, 14154, 14155, 14165, 14166, - 14167, 14168, 14169, 14170, 14171, 14172, 14173, 14174, 14175, 14176, - 14177, 14178, 14179, 14180, 14181, 14182, 14183, 14184, 14185, 14186, - 14187, 14188, 14189, 14190, 14191, 14192, 14193, 14194, 14195, 14196, - 14197, 14198, 14199, 14200, 14201, 14202, 14203, 14204, 14205, 14206, - 14207, 14208, 14209, 14214, 14215, 14216, 14217, 14218, 14219, 14220, - 14221, 14222, 14223, 14224, 14225, 14226, 14227, 14228, 14229, 14230, - 14231, 14232, 14233, 14234, 14235, 14236, 14237, 14238, 14239, 14240, - 14241, 14242, 14243, 14244, 14245, 14246, 14247, 14248, 14249, 14250, - 14251, 14252, 14253, 14254, 14255, 14256, 14257, 14258, 14259, 14260, - 14261, 14262, 14263, 14264, 14265, 14266, 14267, 14268, 14269, 14270, - 14271, 14272, 14273, 14274, 14275, 14276, 14277, 14278, 14279, 14280, - 14281, 14282, 14283, 14284, 14285, 14286, 14287, 14288, 14289, 14290, - 14291, 14292, 14293, 14294, 14295, 14296, 14297, 14298, 14299, 14300, - 14301, 14302, 14303, 14304, 14305, 14306, 14307, 14308, 14309, 14310, - 14311, 14312, 14313, 14314, 14315, 14316, 14317, 14318, 14319, 14320, - 14321, 14322, 14323, 14324, 14325, 14326, 14327, 14328, 14329, 14330, - 14331, 14332, 14333, 14334, 14335, 14336, 14337, 14338, 14339, 14340, - 14341, 14342, 14343, 14344, 14345, 14346, 14347, 14348, 14349, 14350, - 14351, 14352, 14353, 14354, 14355, 14356, 14357, 14358, 14359, 14360, - 14361, 14362, 14363, 14364, 14365, 14366, 14367, 14368, 14369, 14370, - 14371, 14372, 14373, 14374, 14375, 14376, 14377, 14378, 14379, 14380, - 14381, 14382, 14383, 14384, 14385, 14386, 14387, 14388, 14389, 14390, - 14391, 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 14400, - 14401, 14402, 14403, 14404, 14405, 14406, 14407, 14408, 14409, 14410, - 14411, 14412, 14413, 14414, 14415, 14416, 14417, 14418, 14419, 14420, - 14421, 14422, 14423, 14424, 14425, 14426, 14427, 14428, 14429, 14430, - 14431, 14432, 14433, 14434, 14435, 14436, 14437, 14438, 14439, 14440, - 14441, 14442, 14443, 14444, 14445, 14446, 14447, 14448, 14449, 14450, - 14451, 14452, 14453, 14454, 14455, 14456, 14457, 14458, 14459, 14460, - 14461, 14462, 14463, 14464, 14465, 14466, 14467, 14468, 14469, 14481, - 14480, 14500, 14499, 14506, 14505, 14515, 14514, 14525, 14524, 14530, - 14538, 14540, 14545, 14545, 14554, 14553, 14567, 14566, 14571, 14575, - 14576, 14577, 14581, 14582, 14583, 14584, 14588, 14589, 14590, 14591, - 14596, 14622, 14621, 14721, 14732, 14745, 14761, 14774, 14796, 14831, - 14873, 14901, 14947, 14961, 14962, 14963, 14964, 14968, 14986, 15004, - 15005, 15009, 15010, 15011, 15012, 15016, 15017, 15035, 15049, 15050, - 15051, 15057, 15063, 15075, 15074, 15090, 15091, 15095, 15096, 15100, - 15113, 15114, 15115, 15120, 15125, 15124, 15144, 15160, 15177, 15176, - 15215, 15216, 15220, 15221, 15225, 15226, 15227, 15228, 15230, 15229, - 15243, 15244, 15245, 15246, 15247, 15253, 15253, 15258, 15263, 15273, - 15283, 15287, 15296, 15296, 15301, 15307, 15318, 15329, 15337, 15339, - 15343, 15350, 15357, 15359, 15363, 15364, 15369, 15368, 15372, 15371, - 15375, 15374, 15378, 15377, 15380, 15381, 15382, 15383, 15384, 15385, - 15386, 15387, 15388, 15389, 15390, 15391, 15392, 15393, 15394, 15395, - 15396, 15397, 15398, 15399, 15400, 15401, 15402, 15403, 15404, 15405, - 15409, 15410, 15414, 15415, 15419, 15429, 15439, 15452, 15467, 15480, - 15493, 15505, 15510, 15518, 15523, 15531, 15549, 15569, 15581, 15594, - 15603, 15607, 15611, 15612, 15616, 15643, 15645, 15649, 15653, 15657, - 15664, 15665, 15669, 15670, 15674, 15675, 15679, 15680, 15686, 15692, - 15698, 15708, 15707, 15717, 15718, 15723, 15724, 15725, 15730, 15731, - 15732, 15736, 15737, 15741, 15753, 15762, 15772, 15781, 15795, 15796, - 15801, 15800, 15816, 15817, 15818, 15822, 15823, 15827, 15827, 15851, - 15852, 15856, 15857, 15858, 15862, 15866, 15873, 15876, 15874, 15890, - 15897, 15918, 15942, 15944, 15948, 15949, 15953, 15954, 15962, 15963, - 15964, 15965, 15971, 15977, 15987, 15989, 15991, 15996, 15997, 15998, - 15999, 16000, 16004, 16005, 16006, 16007, 16008, 16009, 16019, 16020, - 16025, 16038, 16051, 16053, 16055, 16060, 16065, 16067, 16069, 16075, - 16076, 16078, 16084, 16083, 16101, 16102, 16106, 16111, 16119, 16119, - 16145, 16144, 16161, 16165, 16170, 16175, 16174, 16186, 16187, 16189, - 16191, 16209, 16215, 16220, 16202, 16283, 16301, 16326, 16358, 16363, - 16371, 16394, 16322, 16460, 16480, 16493, 16503, 16459, 16524, 16528, - 16532, 16536, 16540, 16544, 16551, 16558, 16565, 16575, 16576, 16580, - 16581, 16582, 16586, 16587, 16592, 16594, 16593, 16599, 16600, 16604, - 16614 + 2530, 2531, 2535, 2539, 2543, 2547, 2551, 2556, 2560, 2568, + 2567, 2599, 2598, 2605, 2612, 2613, 2619, 2625, 2635, 2641, + 2647, 2649, 2656, 2657, 2661, 2667, 2676, 2677, 2685, 2685, + 2740, 2741, 2742, 2743, 2744, 2745, 2746, 2747, 2748, 2749, + 2750, 2751, 2752, 2757, 2771, 2785, 2804, 2805, 2809, 2810, + 2815, 2817, 2819, 2821, 2823, 2825, 2827, 2833, 2834, 2835, + 2839, 2843, 2851, 2850, 2863, 2865, 2868, 2870, 2874, 2878, + 2885, 2887, 2891, 2892, 2897, 2916, 2946, 2948, 2952, 2953, + 2957, 2986, 2987, 2988, 2989, 2993, 2994, 2998, 2999, 3004, + 3007, 3034, 3033, 3117, 3134, 3133, 3208, 3207, 3280, 3281, + 3286, 3288, 3293, 3316, 3327, 3331, 3353, 3354, 3358, 3362, + 3375, 3381, 3387, 3396, 3411, 3437, 3443, 3444, 3450, 3453, + 3457, 3465, 3485, 3487, 3505, 3511, 3513, 3515, 3517, 3519, + 3521, 3523, 3525, 3527, 3529, 3531, 3533, 3538, 3554, 3570, + 3571, 3576, 3582, 3591, 3597, 3606, 3614, 3643, 3652, 3654, + 3663, 3668, 3674, 3683, 3691, 3693, 3695, 3697, 3699, 3701, + 3703, 3705, 3707, 3709, 3711, 3713, 3715, 3720, 3740, 3764, + 3766, 3765, 3772, 3773, 3774, 3775, 3776, 3777, 3778, 3779, + 3780, 3781, 3782, 3783, 3784, 3789, 3788, 3799, 3799, 3856, + 3855, 3912, 3912, 3934, 3993, 4043, 4068, 4067, 4093, 4116, + 4118, 4119, 4123, 4141, 4162, 4171, 4207, 4162, 4236, 4238, + 4239, 4243, 4244, 4249, 4260, 4248, 4311, 4310, 4324, 4325, + 4329, 4330, 4335, 4344, 4334, 4393, 4402, 4392, 4446, 4459, + 4464, 4463, 4501, 4502, 4507, 4506, 4540, 4540, 4559, 4558, + 4608, 4625, 4634, 4624, 4688, 4697, 4687, 4737, 4739, 4744, + 4746, 4748, 4765, 4770, 4776, 4783, 4784, 4792, 4798, 4807, + 4813, 4819, 4820, 4824, 4824, 4829, 4830, 4831, 4835, 4836, + 4837, 4840, 4842, 4846, 4847, 4848, 4852, 4853, 4854, 4855, + 4856, 4857, 4858, 4859, 4862, 4864, 4868, 4869, 4870, 4874, + 4875, 4876, 4877, 4878, 4881, 4883, 4887, 4888, 4889, 4893, + 4894, 4895, 4896, 4897, 4898, 4899, 4902, 4904, 4908, 4909, + 4910, 4914, 4915, 4916, 4921, 4929, 4937, 4945, 4957, 4969, + 4974, 4979, 4987, 4995, 5003, 5011, 5019, 5027, 5035, 5048, + 5061, 5075, 5080, 5093, 5094, 5145, 5146, 5149, 5164, 5182, + 5187, 5185, 5192, 5194, 5193, 5197, 5196, 5202, 5239, 5240, + 5245, 5244, 5263, 5282, 5281, 5298, 5302, 5310, 5309, 5312, + 5314, 5316, 5318, 5323, 5324, 5330, 5331, 5348, 5349, 5353, + 5354, 5358, 5377, 5387, 5398, 5407, 5408, 5424, 5426, 5425, + 5430, 5428, 5439, 5440, 5444, 5462, 5478, 5479, 5495, 5510, + 5532, 5533, 5538, 5537, 5561, 5571, 5593, 5592, 5610, 5609, + 5629, 5651, 5655, 5684, 5696, 5697, 5702, 5713, 5701, 5738, + 5739, 5743, 5756, 5777, 5790, 5816, 5817, 5822, 5821, 5858, + 5863, 5864, 5868, 5869, 5873, 5875, 5881, 5883, 5885, 5887, + 5889, 5891, 5901, 5916, 5900, 5930, 5931, 5935, 5936, 5940, + 5941, 5945, 5946, 5950, 5951, 5955, 5956, 5960, 5964, 5965, + 5968, 5970, 5974, 5975, 5979, 5980, 5981, 5985, 5990, 5995, + 6000, 6005, 6010, 6015, 6020, 6035, 6041, 6056, 6061, 6076, + 6082, 6100, 6105, 6110, 6115, 6120, 6126, 6125, 6151, 6152, + 6153, 6158, 6163, 6168, 6170, 6172, 6174, 6180, 6188, 6206, + 6223, 6249, 6267, 6268, 6269, 6270, 6271, 6272, 6276, 6277, + 6278, 6282, 6283, 6287, 6288, 6289, 6290, 6295, 6302, 6303, + 6307, 6308, 6312, 6313, 6320, 6325, 6331, 6337, 6343, 6362, + 6368, 6370, 6374, 6378, 6379, 6383, 6388, 6387, 6410, 6411, + 6412, 6413, 6418, 6422, 6427, 6432, 6436, 6441, 6446, 6452, + 6457, 6463, 6467, 6472, 6477, 6495, 6497, 6499, 6515, 6517, + 6522, 6527, 6539, 6544, 6549, 6554, 6556, 6558, 6560, 6562, + 6564, 6566, 6568, 6571, 6570, 6575, 6574, 6578, 6580, 6589, + 6590, 6591, 6597, 6598, 6599, 6600, 6601, 6605, 6609, 6610, + 6614, 6615, 6619, 6620, 6621, 6622, 6623, 6627, 6628, 6629, + 6630, 6631, 6635, 6640, 6642, 6648, 6649, 6651, 6656, 6666, + 6667, 6671, 6672, 6673, 6681, 6682, 6686, 6687, 6691, 6692, + 6693, 6697, 6698, 6699, 6700, 6703, 6704, 6708, 6709, 6713, + 6714, 6718, 6719, 6723, 6724, 6725, 6726, 6727, 6728, 6734, + 6740, 6746, 6752, 6753, 6766, 6772, 6778, 6784, 6789, 6794, + 6803, 6824, 6832, 6833, 6838, 6839, 6843, 6851, 6855, 6856, + 6860, 6861, 6865, 6874, 6878, 6879, 6883, 6891, 6892, 6896, + 6897, 6901, 6902, 6907, 6908, 6912, 6919, 6928, 6933, 6941, + 6942, 6943, 6944, 6945, 6946, 6951, 6959, 6960, 6965, 6964, + 6977, 6978, 6982, 6985, 6986, 6987, 6988, 6992, 7000, 7007, + 7008, 7012, 7022, 7023, 7027, 7028, 7031, 7033, 7037, 7049, + 7050, 7054, 7061, 7074, 7075, 7077, 7079, 7085, 7090, 7096, + 7102, 7109, 7119, 7120, 7121, 7122, 7123, 7127, 7131, 7132, + 7136, 7137, 7141, 7142, 7146, 7147, 7148, 7152, 7153, 7157, + 7161, 7174, 7186, 7187, 7191, 7192, 7196, 7197, 7201, 7202, + 7206, 7207, 7211, 7212, 7216, 7217, 7221, 7222, 7226, 7228, + 7232, 7233, 7237, 7241, 7242, 7255, 7256, 7257, 7261, 7262, + 7266, 7272, 7286, 7287, 7291, 7292, 7296, 7297, 7305, 7304, + 7350, 7349, 7363, 7375, 7374, 7393, 7392, 7411, 7410, 7429, + 7423, 7443, 7442, 7475, 7480, 7485, 7490, 7495, 7502, 7509, + 7514, 7522, 7523, 7524, 7525, 7529, 7530, 7542, 7543, 7547, + 7548, 7551, 7553, 7561, 7569, 7571, 7573, 7574, 7582, 7583, + 7587, 7596, 7594, 7608, 7622, 7621, 7635, 7633, 7647, 7654, + 7665, 7666, 7694, 7701, 7705, 7710, 7709, 7725, 7727, 7732, + 7740, 7739, 7755, 7759, 7758, 7770, 7771, 7775, 7790, 7791, + 7795, 7804, 7808, 7813, 7819, 7818, 7829, 7838, 7828, 7853, + 7862, 7871, 7880, 7889, 7895, 7901, 7910, 7919, 7947, 7968, + 7978, 7982, 7987, 7988, 7991, 7993, 7994, 7995, 7996, 7999, + 8004, 8015, 8020, 8031, 8032, 8036, 8037, 8041, 8042, 8043, + 8047, 8048, 8053, 8061, 8062, 8063, 8064, 8069, 8068, 8097, + 8107, 8124, 8127, 8134, 8138, 8145, 8149, 8153, 8160, 8165, + 8168, 8175, 8178, 8185, 8188, 8195, 8198, 8206, 8209, 8216, + 8220, 8227, 8231, 8238, 8239, 8264, 8265, 8266, 8271, 8276, + 8284, 8283, 8295, 8296, 8297, 8302, 8301, 8323, 8324, 8328, + 8329, 8333, 8334, 8335, 8340, 8339, 8361, 8370, 8369, 8396, + 8397, 8401, 8402, 8406, 8407, 8408, 8409, 8410, 8411, 8416, + 8415, 8437, 8438, 8439, 8444, 8443, 8449, 8456, 8461, 8469, + 8470, 8474, 8488, 8487, 8500, 8501, 8505, 8506, 8510, 8520, + 8530, 8531, 8536, 8535, 8546, 8547, 8551, 8552, 8556, 8566, + 8577, 8576, 8584, 8584, 8595, 8596, 8601, 8602, 8611, 8620, + 8621, 8625, 8630, 8635, 8640, 8645, 8644, 8664, 8672, 8664, + 8679, 8680, 8681, 8682, 8683, 8687, 8694, 8701, 8703, 8714, + 8715, 8719, 8720, 8748, 8778, 8780, 8789, 8802, 8803, 8804, + 8819, 8826, 8851, 8857, 8863, 8864, 8865, 8866, 8867, 8871, + 8872, 8877, 8928, 8935, 8978, 8984, 8990, 8996, 9002, 9008, + 9014, 9020, 9024, 9030, 9036, 9042, 9048, 9054, 9058, 9064, + 9074, 9080, 9088, 9094, 9104, 9110, 9119, 9129, 9135, 9145, + 9151, 9160, 9164, 9170, 9176, 9182, 9188, 9194, 9200, 9206, + 9212, 9218, 9224, 9230, 9236, 9242, 9248, 9252, 9253, 9257, + 9258, 9262, 9263, 9267, 9268, 9272, 9273, 9274, 9275, 9276, + 9277, 9281, 9282, 9286, 9287, 9288, 9289, 9290, 9291, 9303, + 9304, 9305, 9306, 9307, 9313, 9317, 9323, 9329, 9335, 9341, + 9343, 9350, 9357, 9363, 9404, 9413, 9420, 9428, 9434, 9441, + 9447, 9461, 9468, 9484, 9490, 9496, 9504, 9510, 9516, 9522, + 9528, 9543, 9555, 9561, 9567, 9573, 9579, 9585, 9591, 9597, + 9603, 9609, 9615, 9621, 9627, 9633, 9639, 9645, 9651, 9659, + 9680, 9687, 9693, 9700, 9707, 9714, 9721, 9727, 9733, 9738, + 9744, 9751, 9757, 9763, 9769, 9775, 9781, 9799, 9805, 9811, + 9818, 9825, 9840, 9846, 9852, 9858, 9864, 9871, 9877, 9883, + 9889, 9895, 9901, 9909, 9922, 9928, 9934, 9940, 9946, 9954, + 9960, 9972, 9978, 9984, 9992, 10002, 10008, 10024, 10030, 10037, + 10044, 10051, 10058, 10065, 10069, 10089, 10088, 10161, 10201, 10203, + 10208, 10209, 10213, 10214, 10218, 10219, 10223, 10230, 10238, 10264, + 10270, 10276, 10282, 10288, 10294, 10303, 10310, 10312, 10309, 10319, + 10330, 10336, 10342, 10348, 10354, 10360, 10366, 10372, 10378, 10385, + 10384, 10404, 10403, 10418, 10429, 10437, 10453, 10454, 10459, 10464, + 10467, 10470, 10469, 10486, 10488, 10494, 10493, 10510, 10512, 10514, + 10516, 10518, 10520, 10522, 10524, 10526, 10528, 10530, 10535, 10536, + 10540, 10547, 10555, 10556, 10560, 10567, 10575, 10576, 10580, 10581, + 10585, 10593, 10604, 10605, 10614, 10625, 10626, 10632, 10633, 10653, + 10655, 10659, 10657, 10674, 10672, 10690, 10688, 10695, 10704, 10702, + 10720, 10719, 10729, 10740, 10738, 10757, 10756, 10767, 10778, 10779, + 10780, 10788, 10789, 10793, 10808, 10808, 10823, 10863, 10936, 10947, + 10952, 10944, 10971, 10991, 10999, 10991, 11008, 11007, 11030, 11047, + 11030, 11054, 11058, 11084, 11085, 11090, 11093, 11094, 11095, 11099, + 11100, 11105, 11104, 11110, 11109, 11117, 11118, 11121, 11123, 11123, + 11127, 11127, 11132, 11133, 11137, 11139, 11144, 11145, 11149, 11160, + 11173, 11174, 11175, 11176, 11177, 11178, 11179, 11180, 11181, 11182, + 11183, 11184, 11188, 11189, 11190, 11191, 11192, 11193, 11194, 11195, + 11196, 11200, 11201, 11202, 11203, 11206, 11208, 11209, 11213, 11214, + 11222, 11224, 11228, 11230, 11229, 11243, 11246, 11245, 11260, 11266, + 11281, 11283, 11287, 11289, 11294, 11295, 11315, 11346, 11350, 11351, + 11355, 11368, 11370, 11375, 11374, 11409, 11411, 11416, 11417, 11418, + 11423, 11429, 11433, 11434, 11438, 11445, 11452, 11459, 11469, 11496, + 11500, 11506, 11512, 11522, 11526, 11536, 11537, 11538, 11539, 11540, + 11541, 11545, 11546, 11547, 11548, 11549, 11553, 11554, 11555, 11556, + 11557, 11561, 11562, 11563, 11564, 11568, 11573, 11574, 11577, 11580, + 11579, 11613, 11614, 11618, 11626, 11639, 11639, 11649, 11650, 11654, + 11673, 11713, 11712, 11725, 11733, 11724, 11735, 11747, 11759, 11758, + 11776, 11775, 11786, 11787, 11786, 11803, 11810, 11831, 11852, 11864, + 11869, 11868, 11878, 11884, 11891, 11896, 11901, 11911, 11912, 11916, + 11927, 11940, 11941, 11945, 11956, 11957, 11961, 11962, 11965, 11967, + 11970, 11971, 11972, 11976, 11977, 11985, 11993, 11984, 12003, 12010, + 12002, 12020, 12032, 12033, 12046, 12050, 12051, 12067, 12068, 12072, + 12081, 12082, 12083, 12085, 12084, 12095, 12096, 12100, 12101, 12103, + 12102, 12106, 12105, 12111, 12112, 12116, 12117, 12121, 12131, 12132, + 12136, 12137, 12142, 12141, 12155, 12156, 12160, 12165, 12173, 12174, + 12182, 12184, 12184, 12192, 12200, 12191, 12222, 12223, 12227, 12235, + 12236, 12240, 12250, 12251, 12258, 12257, 12273, 12272, 12286, 12285, + 12297, 12296, 12310, 12311, 12315, 12328, 12344, 12345, 12349, 12350, + 12354, 12355, 12356, 12361, 12360, 12382, 12384, 12387, 12389, 12392, + 12393, 12396, 12400, 12404, 12408, 12412, 12416, 12420, 12424, 12428, + 12436, 12439, 12449, 12448, 12463, 12470, 12478, 12486, 12494, 12502, + 12510, 12517, 12519, 12521, 12530, 12534, 12539, 12538, 12544, 12543, + 12548, 12557, 12564, 12569, 12571, 12573, 12575, 12577, 12585, 12596, + 12604, 12606, 12614, 12621, 12628, 12638, 12645, 12651, 12660, 12668, + 12672, 12676, 12683, 12690, 12696, 12703, 12710, 12715, 12720, 12728, + 12730, 12732, 12737, 12738, 12741, 12743, 12747, 12748, 12752, 12753, + 12757, 12758, 12762, 12763, 12767, 12768, 12771, 12773, 12780, 12791, + 12790, 12806, 12805, 12812, 12813, 12814, 12815, 12816, 12820, 12821, + 12826, 12830, 12836, 12842, 12864, 12865, 12866, 12881, 12880, 12893, + 12902, 12892, 12904, 12908, 12909, 12921, 12920, 12942, 12943, 12948, + 12950, 12952, 12954, 12956, 12958, 12960, 12962, 12964, 12966, 12968, + 12970, 12972, 12977, 12978, 12983, 12982, 12992, 12993, 12997, 12997, + 12999, 13000, 13004, 13005, 13010, 13009, 13020, 13024, 13028, 13040, + 13050, 13051, 13052, 13058, 13070, 13082, 13092, 13102, 13069, 13110, + 13111, 13115, 13116, 13120, 13121, 13133, 13137, 13138, 13139, 13142, + 13144, 13148, 13149, 13153, 13158, 13165, 13170, 13177, 13179, 13183, + 13184, 13188, 13193, 13201, 13202, 13205, 13207, 13215, 13217, 13221, + 13222, 13223, 13227, 13229, 13234, 13235, 13244, 13245, 13249, 13250, + 13254, 13274, 13298, 13310, 13321, 13340, 13348, 13360, 13375, 13396, + 13397, 13398, 13407, 13408, 13409, 13410, 13425, 13431, 13437, 13443, + 13449, 13480, 13513, 13523, 13533, 13539, 13548, 13560, 13566, 13572, + 13588, 13589, 13593, 13602, 13618, 13622, 13673, 13677, 13695, 13699, + 13779, 13804, 13835, 13836, 13852, 13862, 13866, 13872, 13878, 13888, + 13894, 13903, 13913, 13914, 13944, 13957, 13973, 13989, 14006, 14007, + 14018, 14019, 14030, 14031, 14032, 14036, 14063, 14096, 14111, 14112, + 14113, 14114, 14115, 14116, 14117, 14118, 14119, 14120, 14121, 14122, + 14123, 14124, 14125, 14126, 14127, 14128, 14129, 14130, 14131, 14132, + 14133, 14134, 14135, 14136, 14137, 14138, 14139, 14140, 14141, 14142, + 14143, 14144, 14145, 14146, 14147, 14148, 14149, 14150, 14151, 14152, + 14153, 14154, 14155, 14156, 14157, 14158, 14159, 14160, 14170, 14171, + 14172, 14173, 14174, 14175, 14176, 14177, 14178, 14179, 14180, 14181, + 14182, 14183, 14184, 14185, 14186, 14187, 14188, 14189, 14190, 14191, + 14192, 14193, 14194, 14195, 14196, 14197, 14198, 14199, 14200, 14201, + 14202, 14203, 14204, 14205, 14206, 14207, 14208, 14209, 14210, 14211, + 14212, 14213, 14214, 14219, 14220, 14221, 14222, 14223, 14224, 14225, + 14226, 14227, 14228, 14229, 14230, 14231, 14232, 14233, 14234, 14235, + 14236, 14237, 14238, 14239, 14240, 14241, 14242, 14243, 14244, 14245, + 14246, 14247, 14248, 14249, 14250, 14251, 14252, 14253, 14254, 14255, + 14256, 14257, 14258, 14259, 14260, 14261, 14262, 14263, 14264, 14265, + 14266, 14267, 14268, 14269, 14270, 14271, 14272, 14273, 14274, 14275, + 14276, 14277, 14278, 14279, 14280, 14281, 14282, 14283, 14284, 14285, + 14286, 14287, 14288, 14289, 14290, 14291, 14292, 14293, 14294, 14295, + 14296, 14297, 14298, 14299, 14300, 14301, 14302, 14303, 14304, 14305, + 14306, 14307, 14308, 14309, 14310, 14311, 14312, 14313, 14314, 14315, + 14316, 14317, 14318, 14319, 14320, 14321, 14322, 14323, 14324, 14325, + 14326, 14327, 14328, 14329, 14330, 14331, 14332, 14333, 14334, 14335, + 14336, 14337, 14338, 14339, 14340, 14341, 14342, 14343, 14344, 14345, + 14346, 14347, 14348, 14349, 14350, 14351, 14352, 14353, 14354, 14355, + 14356, 14357, 14358, 14359, 14360, 14361, 14362, 14363, 14364, 14365, + 14366, 14367, 14368, 14369, 14370, 14371, 14372, 14373, 14374, 14375, + 14376, 14377, 14378, 14379, 14380, 14381, 14382, 14383, 14384, 14385, + 14386, 14387, 14388, 14389, 14390, 14391, 14392, 14393, 14394, 14395, + 14396, 14397, 14398, 14399, 14400, 14401, 14402, 14403, 14404, 14405, + 14406, 14407, 14408, 14409, 14410, 14411, 14412, 14413, 14414, 14415, + 14416, 14417, 14418, 14419, 14420, 14421, 14422, 14423, 14424, 14425, + 14426, 14427, 14428, 14429, 14430, 14431, 14432, 14433, 14434, 14435, + 14436, 14437, 14438, 14439, 14440, 14441, 14442, 14443, 14444, 14445, + 14446, 14447, 14448, 14449, 14450, 14451, 14452, 14453, 14454, 14455, + 14456, 14457, 14458, 14459, 14460, 14461, 14462, 14463, 14464, 14465, + 14466, 14467, 14468, 14469, 14470, 14471, 14472, 14473, 14474, 14486, + 14485, 14505, 14504, 14511, 14510, 14520, 14519, 14530, 14529, 14535, + 14543, 14545, 14550, 14550, 14559, 14558, 14572, 14571, 14576, 14580, + 14581, 14582, 14586, 14587, 14588, 14589, 14593, 14594, 14595, 14596, + 14601, 14627, 14626, 14726, 14737, 14750, 14766, 14779, 14801, 14836, + 14878, 14906, 14952, 14966, 14967, 14968, 14969, 14973, 14991, 15009, + 15010, 15014, 15015, 15016, 15017, 15021, 15022, 15040, 15054, 15055, + 15056, 15062, 15068, 15080, 15079, 15095, 15096, 15100, 15101, 15105, + 15118, 15119, 15120, 15125, 15130, 15129, 15149, 15165, 15182, 15181, + 15220, 15221, 15225, 15226, 15230, 15231, 15232, 15233, 15235, 15234, + 15248, 15249, 15250, 15251, 15252, 15258, 15258, 15263, 15268, 15278, + 15288, 15292, 15301, 15301, 15306, 15312, 15323, 15334, 15342, 15344, + 15348, 15355, 15362, 15364, 15368, 15369, 15374, 15373, 15377, 15376, + 15380, 15379, 15383, 15382, 15385, 15386, 15387, 15388, 15389, 15390, + 15391, 15392, 15393, 15394, 15395, 15396, 15397, 15398, 15399, 15400, + 15401, 15402, 15403, 15404, 15405, 15406, 15407, 15408, 15409, 15410, + 15414, 15415, 15419, 15420, 15424, 15434, 15444, 15457, 15472, 15485, + 15498, 15510, 15515, 15523, 15528, 15536, 15554, 15574, 15586, 15599, + 15608, 15612, 15616, 15617, 15621, 15648, 15650, 15654, 15658, 15662, + 15669, 15670, 15674, 15675, 15679, 15680, 15684, 15685, 15691, 15697, + 15703, 15713, 15712, 15722, 15723, 15728, 15729, 15730, 15735, 15736, + 15737, 15741, 15742, 15746, 15758, 15767, 15777, 15786, 15800, 15801, + 15806, 15805, 15821, 15822, 15823, 15827, 15828, 15832, 15832, 15856, + 15857, 15861, 15862, 15863, 15867, 15871, 15878, 15881, 15879, 15895, + 15902, 15923, 15947, 15949, 15953, 15954, 15958, 15959, 15967, 15968, + 15969, 15970, 15976, 15982, 15992, 15994, 15996, 16001, 16002, 16003, + 16004, 16005, 16009, 16010, 16011, 16012, 16013, 16014, 16024, 16025, + 16030, 16043, 16056, 16058, 16060, 16065, 16070, 16072, 16074, 16080, + 16081, 16083, 16089, 16088, 16106, 16107, 16111, 16116, 16124, 16124, + 16150, 16149, 16166, 16170, 16175, 16180, 16179, 16191, 16192, 16194, + 16196, 16214, 16220, 16225, 16207, 16288, 16306, 16331, 16363, 16368, + 16376, 16399, 16327, 16465, 16485, 16498, 16508, 16464, 16529, 16533, + 16537, 16541, 16545, 16549, 16556, 16563, 16570, 16580, 16581, 16585, + 16586, 16587, 16591, 16592, 16597, 16599, 16598, 16604, 16605, 16609, + 16619 }; #endif @@ -18579,7 +18579,7 @@ { case 2: /* Line 1792 of yacc.c */ -#line 1970 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 1970 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; if (!thd->bootstrap && @@ -18595,7 +18595,7 @@ case 3: /* Line 1792 of yacc.c */ -#line 1982 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 1982 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex_input_stream *lip = YYLIP; @@ -18622,7 +18622,7 @@ case 5: /* Line 1792 of yacc.c */ -#line 2007 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2007 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Single query, not terminated. */ YYLIP->found_semicolon= NULL; @@ -18631,7 +18631,7 @@ case 62: /* Line 1792 of yacc.c */ -#line 2081 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2081 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -18642,7 +18642,7 @@ case 65: /* Line 1792 of yacc.c */ -#line 2096 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2096 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -18663,7 +18663,7 @@ case 66: /* Line 1792 of yacc.c */ -#line 2116 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2116 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -18674,7 +18674,7 @@ case 67: /* Line 1792 of yacc.c */ -#line 2123 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2123 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -18685,7 +18685,7 @@ case 68: /* Line 1792 of yacc.c */ -#line 2133 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2133 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -18696,13 +18696,13 @@ case 69: /* Line 1792 of yacc.c */ -#line 2140 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2140 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 74: /* Line 1792 of yacc.c */ -#line 2155 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2155 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; LEX_STRING *lexstr= (LEX_STRING*)sql_memdup(&(yyvsp[(2) - (2)].lex_str), sizeof(LEX_STRING)); @@ -18713,7 +18713,7 @@ case 75: /* Line 1792 of yacc.c */ -#line 2167 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2167 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->sphead) { @@ -18725,7 +18725,7 @@ case 76: /* Line 1792 of yacc.c */ -#line 2175 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_HELP; @@ -18735,7 +18735,7 @@ case 77: /* Line 1792 of yacc.c */ -#line 2186 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2186 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex = Lex; lex->sql_command = SQLCOM_CHANGE_MASTER; @@ -18752,13 +18752,13 @@ case 78: /* Line 1792 of yacc.c */ -#line 2199 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2199 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 81: /* Line 1792 of yacc.c */ -#line 2209 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2209 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.host = (yyvsp[(3) - (3)].lex_str).str; } @@ -18766,7 +18766,7 @@ case 82: /* Line 1792 of yacc.c */ -#line 2213 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2213 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.bind_addr = (yyvsp[(3) - (3)].lex_str).str; } @@ -18774,7 +18774,7 @@ case 83: /* Line 1792 of yacc.c */ -#line 2217 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2217 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.user = (yyvsp[(3) - (3)].lex_str).str; } @@ -18782,7 +18782,7 @@ case 84: /* Line 1792 of yacc.c */ -#line 2221 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.password = (yyvsp[(3) - (3)].lex_str).str; Lex->contains_plaintext_password= true; @@ -18791,7 +18791,7 @@ case 85: /* Line 1792 of yacc.c */ -#line 2226 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2226 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.port = (yyvsp[(3) - (3)].ulong_num); } @@ -18799,7 +18799,7 @@ case 86: /* Line 1792 of yacc.c */ -#line 2230 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2230 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.connect_retry = (yyvsp[(3) - (3)].ulong_num); } @@ -18807,7 +18807,7 @@ case 87: /* Line 1792 of yacc.c */ -#line 2234 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2234 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.retry_count= (yyvsp[(3) - (3)].ulong_num); Lex->mi.retry_count_opt= LEX_MASTER_INFO::LEX_MI_ENABLE; @@ -18816,7 +18816,7 @@ case 88: /* Line 1792 of yacc.c */ -#line 2239 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2239 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(3) - (3)].ulong_num) > MASTER_DELAY_MAX) { @@ -18833,7 +18833,7 @@ case 89: /* Line 1792 of yacc.c */ -#line 2252 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2252 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl= (yyvsp[(3) - (3)].ulong_num) ? LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE; @@ -18842,7 +18842,7 @@ case 90: /* Line 1792 of yacc.c */ -#line 2257 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2257 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_ca= (yyvsp[(3) - (3)].lex_str).str; } @@ -18850,7 +18850,7 @@ case 91: /* Line 1792 of yacc.c */ -#line 2261 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2261 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_capath= (yyvsp[(3) - (3)].lex_str).str; } @@ -18858,7 +18858,7 @@ case 92: /* Line 1792 of yacc.c */ -#line 2265 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2265 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_cert= (yyvsp[(3) - (3)].lex_str).str; } @@ -18866,7 +18866,7 @@ case 93: /* Line 1792 of yacc.c */ -#line 2269 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2269 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_cipher= (yyvsp[(3) - (3)].lex_str).str; } @@ -18874,7 +18874,7 @@ case 94: /* Line 1792 of yacc.c */ -#line 2273 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2273 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_key= (yyvsp[(3) - (3)].lex_str).str; } @@ -18882,7 +18882,7 @@ case 95: /* Line 1792 of yacc.c */ -#line 2277 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_verify_server_cert= (yyvsp[(3) - (3)].ulong_num) ? LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE; @@ -18891,7 +18891,7 @@ case 96: /* Line 1792 of yacc.c */ -#line 2282 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2282 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_crl= (yyvsp[(3) - (3)].lex_str).str; } @@ -18899,7 +18899,7 @@ case 97: /* Line 1792 of yacc.c */ -#line 2286 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2286 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.ssl_crlpath= (yyvsp[(3) - (3)].lex_str).str; } @@ -18907,7 +18907,7 @@ case 98: /* Line 1792 of yacc.c */ -#line 2291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2291 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.heartbeat_period= (float) (yyvsp[(3) - (3)].item_num)->val_real(); if (Lex->mi.heartbeat_period > SLAVE_MAX_HEARTBEAT_PERIOD || @@ -18942,7 +18942,7 @@ case 99: /* Line 1792 of yacc.c */ -#line 2322 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2322 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE; } @@ -18950,7 +18950,7 @@ case 100: /* Line 1792 of yacc.c */ -#line 2327 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2327 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.auto_position= (yyvsp[(3) - (3)].ulong_num) ? LEX_MASTER_INFO::LEX_MI_ENABLE : @@ -18960,7 +18960,7 @@ case 105: /* Line 1792 of yacc.c */ -#line 2344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->mi.repl_ignore_server_ids.elements == 0) { @@ -18976,7 +18976,7 @@ case 106: /* Line 1792 of yacc.c */ -#line 2358 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2358 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.log_file_name = (yyvsp[(3) - (3)].lex_str).str; } @@ -18984,7 +18984,7 @@ case 107: /* Line 1792 of yacc.c */ -#line 2362 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2362 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.pos = (yyvsp[(3) - (3)].ulonglong_number); /* @@ -19004,7 +19004,7 @@ case 108: /* Line 1792 of yacc.c */ -#line 2378 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2378 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.relay_log_name = (yyvsp[(3) - (3)].lex_str).str; } @@ -19012,7 +19012,7 @@ case 109: /* Line 1792 of yacc.c */ -#line 2382 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2382 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.relay_log_pos = (yyvsp[(3) - (3)].ulong_num); /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */ @@ -19023,7 +19023,7 @@ case 110: /* Line 1792 of yacc.c */ -#line 2394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2394 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19053,7 +19053,7 @@ case 111: /* Line 1792 of yacc.c */ -#line 2420 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2420 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19076,7 +19076,7 @@ case 112: /* Line 1792 of yacc.c */ -#line 2439 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2439 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table))) MYSQL_YYABORT; @@ -19085,7 +19085,7 @@ case 113: /* Line 1792 of yacc.c */ -#line 2444 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2444 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str))) MYSQL_YYABORT; @@ -19094,13 +19094,13 @@ case 114: /* Line 1792 of yacc.c */ -#line 2448 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2448 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 115: /* Line 1792 of yacc.c */ -#line 2451 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2451 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table))) MYSQL_YYABORT; @@ -19109,7 +19109,7 @@ case 116: /* Line 1792 of yacc.c */ -#line 2456 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2456 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str))) MYSQL_YYABORT; @@ -19118,13 +19118,13 @@ case 117: /* Line 1792 of yacc.c */ -#line 2460 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2460 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 118: /* Line 1792 of yacc.c */ -#line 2463 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2463 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table))) MYSQL_YYABORT; @@ -19133,7 +19133,7 @@ case 119: /* Line 1792 of yacc.c */ -#line 2468 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2468 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str))) MYSQL_YYABORT; @@ -19142,13 +19142,13 @@ case 120: /* Line 1792 of yacc.c */ -#line 2472 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2472 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 121: /* Line 1792 of yacc.c */ -#line 2474 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2474 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.default_table_charset= NULL; Lex->create_info.used_fields= 0; @@ -19157,7 +19157,7 @@ case 122: /* Line 1792 of yacc.c */ -#line 2479 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2479 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command=SQLCOM_CREATE_DB; @@ -19168,7 +19168,7 @@ case 123: /* Line 1792 of yacc.c */ -#line 2486 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2486 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_mode= VIEW_CREATE_NEW; Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; @@ -19178,13 +19178,13 @@ case 124: /* Line 1792 of yacc.c */ -#line 2492 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2492 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 125: /* Line 1792 of yacc.c */ -#line 2494 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2494 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_CREATE_USER; } @@ -19192,7 +19192,7 @@ case 126: /* Line 1792 of yacc.c */ -#line 2498 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2498 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP; } @@ -19200,7 +19200,7 @@ case 127: /* Line 1792 of yacc.c */ -#line 2502 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2502 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE; } @@ -19208,7 +19208,7 @@ case 128: /* Line 1792 of yacc.c */ -#line 2506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2506 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_CREATE_SERVER; } @@ -19216,8 +19216,13 @@ case 129: /* Line 1792 of yacc.c */ -#line 2517 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2517 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { + if ((yyvsp[(2) - (10)].lex_str).length == 0) + { + my_error(ER_WRONG_VALUE, MYF(0), "server name", ""); + MYSQL_YYABORT; + } Lex->server_options.server_name= (yyvsp[(2) - (10)].lex_str).str; Lex->server_options.server_name_length= (yyvsp[(2) - (10)].lex_str).length; Lex->server_options.scheme= (yyvsp[(6) - (10)].lex_str).str; @@ -19226,7 +19231,7 @@ case 132: /* Line 1792 of yacc.c */ -#line 2531 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2536 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.username= (yyvsp[(2) - (2)].lex_str).str; } @@ -19234,7 +19239,7 @@ case 133: /* Line 1792 of yacc.c */ -#line 2535 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2540 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.host= (yyvsp[(2) - (2)].lex_str).str; } @@ -19242,7 +19247,7 @@ case 134: /* Line 1792 of yacc.c */ -#line 2539 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2544 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.db= (yyvsp[(2) - (2)].lex_str).str; } @@ -19250,7 +19255,7 @@ case 135: /* Line 1792 of yacc.c */ -#line 2543 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2548 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.owner= (yyvsp[(2) - (2)].lex_str).str; } @@ -19258,7 +19263,7 @@ case 136: /* Line 1792 of yacc.c */ -#line 2547 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2552 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.password= (yyvsp[(2) - (2)].lex_str).str; Lex->contains_plaintext_password= true; @@ -19267,7 +19272,7 @@ case 137: /* Line 1792 of yacc.c */ -#line 2552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.socket= (yyvsp[(2) - (2)].lex_str).str; } @@ -19275,7 +19280,7 @@ case 138: /* Line 1792 of yacc.c */ -#line 2556 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2561 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->server_options.port= (yyvsp[(2) - (2)].ulong_num); } @@ -19283,7 +19288,7 @@ case 139: /* Line 1792 of yacc.c */ -#line 2563 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2568 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex=Lex; @@ -19303,7 +19308,7 @@ case 140: /* Line 1792 of yacc.c */ -#line 2583 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2588 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* sql_command is set here because some rules in ev_sql_stmt @@ -19315,7 +19320,7 @@ case 141: /* Line 1792 of yacc.c */ -#line 2594 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2599 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->item_expression= (yyvsp[(2) - (3)].item); Lex->event_parse_data->interval= (yyvsp[(3) - (3)].interval); @@ -19324,7 +19329,7 @@ case 143: /* Line 1792 of yacc.c */ -#line 2601 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2606 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->item_execute_at= (yyvsp[(2) - (2)].item); } @@ -19332,13 +19337,13 @@ case 144: /* Line 1792 of yacc.c */ -#line 2607 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2612 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 145: /* Line 1792 of yacc.c */ -#line 2609 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2614 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->status= Event_parse_data::ENABLED; Lex->event_parse_data->status_changed= true; @@ -19348,7 +19353,7 @@ case 146: /* Line 1792 of yacc.c */ -#line 2615 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2620 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->status= Event_parse_data::SLAVESIDE_DISABLED; Lex->event_parse_data->status_changed= true; @@ -19358,7 +19363,7 @@ case 147: /* Line 1792 of yacc.c */ -#line 2621 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2626 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->status= Event_parse_data::DISABLED; Lex->event_parse_data->status_changed= true; @@ -19368,7 +19373,7 @@ case 148: /* Line 1792 of yacc.c */ -#line 2630 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2635 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item= new (YYTHD->mem_root) Item_func_now_local(0); if (item == NULL) @@ -19379,7 +19384,7 @@ case 149: /* Line 1792 of yacc.c */ -#line 2637 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2642 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->item_starts= (yyvsp[(2) - (2)].item); } @@ -19387,7 +19392,7 @@ case 151: /* Line 1792 of yacc.c */ -#line 2645 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2650 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->item_ends= (yyvsp[(2) - (2)].item); } @@ -19395,13 +19400,13 @@ case 152: /* Line 1792 of yacc.c */ -#line 2651 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2656 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 154: /* Line 1792 of yacc.c */ -#line 2657 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2662 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->on_completion= Event_parse_data::ON_COMPLETION_PRESERVE; @@ -19411,7 +19416,7 @@ case 155: /* Line 1792 of yacc.c */ -#line 2663 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2668 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->event_parse_data->on_completion= Event_parse_data::ON_COMPLETION_DROP; @@ -19421,13 +19426,13 @@ case 156: /* Line 1792 of yacc.c */ -#line 2671 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2676 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 157: /* Line 1792 of yacc.c */ -#line 2673 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2678 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->comment= Lex->event_parse_data->comment= (yyvsp[(2) - (2)].lex_str); (yyval.num)= 1; @@ -19436,7 +19441,7 @@ case 158: /* Line 1792 of yacc.c */ -#line 2680 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2685 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19483,7 +19488,7 @@ case 159: /* Line 1792 of yacc.c */ -#line 2723 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2728 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19497,7 +19502,7 @@ case 173: /* Line 1792 of yacc.c */ -#line 2752 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2757 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->users_list.empty(); @@ -19513,7 +19518,7 @@ case 174: /* Line 1792 of yacc.c */ -#line 2767 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2772 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(yyvsp[(1) - (3)].lex_str).str || (check_and_convert_db_name(&(yyvsp[(1) - (3)].lex_str), FALSE) != IDENT_NAME_OK)) @@ -19531,7 +19536,7 @@ case 175: /* Line 1792 of yacc.c */ -#line 2781 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2786 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19551,91 +19556,91 @@ case 176: /* Line 1792 of yacc.c */ -#line 2799 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2804 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 177: /* Line 1792 of yacc.c */ -#line 2800 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2805 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 178: /* Line 1792 of yacc.c */ -#line 2804 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2809 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 179: /* Line 1792 of yacc.c */ -#line 2805 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2810 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 180: /* Line 1792 of yacc.c */ -#line 2811 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2816 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.comment= (yyvsp[(2) - (2)].lex_str); } break; case 181: /* Line 1792 of yacc.c */ -#line 2813 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2818 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Just parse it, we only have one language for now. */ } break; case 182: /* Line 1792 of yacc.c */ -#line 2815 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2820 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.daccess= SP_NO_SQL; } break; case 183: /* Line 1792 of yacc.c */ -#line 2817 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2822 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; } break; case 184: /* Line 1792 of yacc.c */ -#line 2819 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2824 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; } break; case 185: /* Line 1792 of yacc.c */ -#line 2821 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2826 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; } break; case 186: /* Line 1792 of yacc.c */ -#line 2823 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2828 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 187: /* Line 1792 of yacc.c */ -#line 2828 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2833 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 188: /* Line 1792 of yacc.c */ -#line 2829 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2834 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.detistic= TRUE; } break; case 189: /* Line 1792 of yacc.c */ -#line 2830 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2835 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.detistic= FALSE; } break; case 190: /* Line 1792 of yacc.c */ -#line 2835 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2840 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.suid= SP_IS_SUID; } @@ -19643,7 +19648,7 @@ case 191: /* Line 1792 of yacc.c */ -#line 2839 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2844 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sp_chistics.suid= SP_IS_NOT_SUID; } @@ -19651,7 +19656,7 @@ case 192: /* Line 1792 of yacc.c */ -#line 2846 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2851 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex = Lex; @@ -19664,13 +19669,13 @@ case 193: /* Line 1792 of yacc.c */ -#line 2854 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2859 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 198: /* Line 1792 of yacc.c */ -#line 2870 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2875 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->value_list.push_back((yyvsp[(3) - (3)].item)); } @@ -19678,7 +19683,7 @@ case 199: /* Line 1792 of yacc.c */ -#line 2874 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2879 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->value_list.push_back((yyvsp[(1) - (1)].item)); } @@ -19686,7 +19691,7 @@ case 204: /* Line 1792 of yacc.c */ -#line 2892 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2897 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -19707,7 +19712,7 @@ case 205: /* Line 1792 of yacc.c */ -#line 2912 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2917 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19738,7 +19743,7 @@ case 210: /* Line 1792 of yacc.c */ -#line 2953 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2958 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19768,43 +19773,43 @@ case 211: /* Line 1792 of yacc.c */ -#line 2981 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2986 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_variable::MODE_IN; } break; case 212: /* Line 1792 of yacc.c */ -#line 2982 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2987 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_variable::MODE_IN; } break; case 213: /* Line 1792 of yacc.c */ -#line 2983 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2988 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_variable::MODE_OUT; } break; case 214: /* Line 1792 of yacc.c */ -#line 2984 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2989 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_variable::MODE_INOUT; } break; case 215: /* Line 1792 of yacc.c */ -#line 2988 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2993 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 217: /* Line 1792 of yacc.c */ -#line 2993 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 2998 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 219: /* Line 1792 of yacc.c */ -#line 2999 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3004 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0; } @@ -19812,7 +19817,7 @@ case 220: /* Line 1792 of yacc.c */ -#line 3003 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3008 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* We check for declarations out of (standard) order this way because letting the grammar rules reflect it caused tricky @@ -19839,7 +19844,7 @@ case 221: /* Line 1792 of yacc.c */ -#line 3029 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3034 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19853,7 +19858,7 @@ case 222: /* Line 1792 of yacc.c */ -#line 3040 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3045 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19930,7 +19935,7 @@ case 223: /* Line 1792 of yacc.c */ -#line 3113 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3118 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19950,7 +19955,7 @@ case 224: /* Line 1792 of yacc.c */ -#line 3129 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3134 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -19994,7 +19999,7 @@ case 225: /* Line 1792 of yacc.c */ -#line 3169 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3174 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -20032,7 +20037,7 @@ case 226: /* Line 1792 of yacc.c */ -#line 3203 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3208 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -20045,7 +20050,7 @@ case 227: /* Line 1792 of yacc.c */ -#line 3212 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3217 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *cursor_lex= Lex; @@ -20110,31 +20115,31 @@ case 228: /* Line 1792 of yacc.c */ -#line 3275 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3280 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_handler::EXIT; } break; case 229: /* Line 1792 of yacc.c */ -#line 3276 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3281 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= sp_handler::CONTINUE; } break; case 230: /* Line 1792 of yacc.c */ -#line 3282 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3287 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 231: /* Line 1792 of yacc.c */ -#line 3284 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3289 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)+= 1; } break; case 232: /* Line 1792 of yacc.c */ -#line 3289 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3294 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -20158,7 +20163,7 @@ case 233: /* Line 1792 of yacc.c */ -#line 3312 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3317 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* mysql errno */ if ((yyvsp[(1) - (1)].ulong_num) == 0) { @@ -20173,7 +20178,7 @@ case 235: /* Line 1792 of yacc.c */ -#line 3327 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3332 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* SQLSTATE */ /* @@ -20196,19 +20201,19 @@ case 236: /* Line 1792 of yacc.c */ -#line 3348 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3353 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 237: /* Line 1792 of yacc.c */ -#line 3349 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3354 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 238: /* Line 1792 of yacc.c */ -#line 3354 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3359 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue); } @@ -20216,7 +20221,7 @@ case 239: /* Line 1792 of yacc.c */ -#line 3358 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3363 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); @@ -20233,7 +20238,7 @@ case 240: /* Line 1792 of yacc.c */ -#line 3371 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3376 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::WARNING); if ((yyval.spcondvalue) == NULL) @@ -20243,7 +20248,7 @@ case 241: /* Line 1792 of yacc.c */ -#line 3377 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3382 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::NOT_FOUND); if ((yyval.spcondvalue) == NULL) @@ -20253,7 +20258,7 @@ case 242: /* Line 1792 of yacc.c */ -#line 3383 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3388 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::EXCEPTION); if ((yyval.spcondvalue) == NULL) @@ -20263,7 +20268,7 @@ case 243: /* Line 1792 of yacc.c */ -#line 3392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20279,7 +20284,7 @@ case 244: /* Line 1792 of yacc.c */ -#line 3407 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3412 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); @@ -20309,25 +20314,25 @@ case 245: /* Line 1792 of yacc.c */ -#line 3433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue); } break; case 246: /* Line 1792 of yacc.c */ -#line 3438 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3443 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= NULL; } break; case 247: /* Line 1792 of yacc.c */ -#line 3440 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3445 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.spcondvalue)= (yyvsp[(1) - (1)].spcondvalue); } break; case 248: /* Line 1792 of yacc.c */ -#line 3445 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3450 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear(); } @@ -20335,7 +20340,7 @@ case 250: /* Line 1792 of yacc.c */ -#line 3453 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3458 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Set_signal_information *info; info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info; @@ -20347,7 +20352,7 @@ case 251: /* Line 1792 of yacc.c */ -#line 3462 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3467 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Set_signal_information *info; info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info; @@ -20364,13 +20369,13 @@ case 252: /* Line 1792 of yacc.c */ -#line 3481 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3486 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 253: /* Line 1792 of yacc.c */ -#line 3483 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3488 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(1) - (1)].item)->type() == Item::FUNC_ITEM) { @@ -20392,85 +20397,85 @@ case 254: /* Line 1792 of yacc.c */ -#line 3501 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3506 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 255: /* Line 1792 of yacc.c */ -#line 3507 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3512 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CLASS_ORIGIN; } break; case 256: /* Line 1792 of yacc.c */ -#line 3509 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3514 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_SUBCLASS_ORIGIN; } break; case 257: /* Line 1792 of yacc.c */ -#line 3511 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3516 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_CATALOG; } break; case 258: /* Line 1792 of yacc.c */ -#line 3513 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3518 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_SCHEMA; } break; case 259: /* Line 1792 of yacc.c */ -#line 3515 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3520 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_NAME; } break; case 260: /* Line 1792 of yacc.c */ -#line 3517 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3522 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CATALOG_NAME; } break; case 261: /* Line 1792 of yacc.c */ -#line 3519 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3524 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_SCHEMA_NAME; } break; case 262: /* Line 1792 of yacc.c */ -#line 3521 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3526 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_TABLE_NAME; } break; case 263: /* Line 1792 of yacc.c */ -#line 3523 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3528 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_COLUMN_NAME; } break; case 264: /* Line 1792 of yacc.c */ -#line 3525 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3530 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_CURSOR_NAME; } break; case 265: /* Line 1792 of yacc.c */ -#line 3527 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3532 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_MESSAGE_TEXT; } break; case 266: /* Line 1792 of yacc.c */ -#line 3529 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3534 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_condition_item_name)= DIAG_MYSQL_ERRNO; } break; case 267: /* Line 1792 of yacc.c */ -#line 3534 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3539 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20487,7 +20492,7 @@ case 268: /* Line 1792 of yacc.c */ -#line 3550 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3555 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Diagnostics_information *info= (yyvsp[(4) - (4)].diag_info); @@ -20503,19 +20508,19 @@ case 269: /* Line 1792 of yacc.c */ -#line 3565 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3570 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; } break; case 270: /* Line 1792 of yacc.c */ -#line 3567 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3572 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_area)= Diagnostics_information::CURRENT_AREA; } break; case 271: /* Line 1792 of yacc.c */ -#line 3572 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3577 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_info)= new (YYTHD->mem_root) Statement_information((yyvsp[(1) - (1)].stmt_info_list)); if ((yyval.diag_info) == NULL) @@ -20525,7 +20530,7 @@ case 272: /* Line 1792 of yacc.c */ -#line 3578 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3583 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.diag_info)= new (YYTHD->mem_root) Condition_information((yyvsp[(2) - (3)].item), (yyvsp[(3) - (3)].cond_info_list)); if ((yyval.diag_info) == NULL) @@ -20535,7 +20540,7 @@ case 273: /* Line 1792 of yacc.c */ -#line 3587 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3592 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.stmt_info_list)= new (YYTHD->mem_root) List; if ((yyval.stmt_info_list) == NULL || (yyval.stmt_info_list)->push_back((yyvsp[(1) - (1)].stmt_info_item))) @@ -20545,7 +20550,7 @@ case 274: /* Line 1792 of yacc.c */ -#line 3593 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3598 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(1) - (3)].stmt_info_list)->push_back((yyvsp[(3) - (3)].stmt_info_item))) MYSQL_YYABORT; @@ -20555,7 +20560,7 @@ case 275: /* Line 1792 of yacc.c */ -#line 3602 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3607 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.stmt_info_item)= new (YYTHD->mem_root) Statement_information_item((yyvsp[(3) - (3)].stmt_info_item_name), (yyvsp[(1) - (3)].item)); if ((yyval.stmt_info_item) == NULL) @@ -20565,7 +20570,7 @@ case 276: /* Line 1792 of yacc.c */ -#line 3610 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3615 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20598,7 +20603,7 @@ case 277: /* Line 1792 of yacc.c */ -#line 3639 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3644 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(2) - (2)].lex_str)); if ((yyval.item) == NULL) @@ -20608,25 +20613,25 @@ case 278: /* Line 1792 of yacc.c */ -#line 3648 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3653 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.stmt_info_item_name)= Statement_information_item::NUMBER; } break; case 279: /* Line 1792 of yacc.c */ -#line 3650 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3655 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.stmt_info_item_name)= Statement_information_item::ROW_COUNT; } break; case 280: /* Line 1792 of yacc.c */ -#line 3659 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3664 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 281: /* Line 1792 of yacc.c */ -#line 3664 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3669 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_list)= new (YYTHD->mem_root) List; if ((yyval.cond_info_list) == NULL || (yyval.cond_info_list)->push_back((yyvsp[(1) - (1)].cond_info_item))) @@ -20636,7 +20641,7 @@ case 282: /* Line 1792 of yacc.c */ -#line 3670 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3675 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(1) - (3)].cond_info_list)->push_back((yyvsp[(3) - (3)].cond_info_item))) MYSQL_YYABORT; @@ -20646,7 +20651,7 @@ case 283: /* Line 1792 of yacc.c */ -#line 3679 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3684 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item)= new (YYTHD->mem_root) Condition_information_item((yyvsp[(3) - (3)].cond_info_item_name), (yyvsp[(1) - (3)].item)); if ((yyval.cond_info_item) == NULL) @@ -20656,85 +20661,85 @@ case 284: /* Line 1792 of yacc.c */ -#line 3687 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3692 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CLASS_ORIGIN; } break; case 285: /* Line 1792 of yacc.c */ -#line 3689 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3694 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::SUBCLASS_ORIGIN; } break; case 286: /* Line 1792 of yacc.c */ -#line 3691 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3696 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_CATALOG; } break; case 287: /* Line 1792 of yacc.c */ -#line 3693 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3698 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_SCHEMA; } break; case 288: /* Line 1792 of yacc.c */ -#line 3695 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3700 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CONSTRAINT_NAME; } break; case 289: /* Line 1792 of yacc.c */ -#line 3697 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3702 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CATALOG_NAME; } break; case 290: /* Line 1792 of yacc.c */ -#line 3699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::SCHEMA_NAME; } break; case 291: /* Line 1792 of yacc.c */ -#line 3701 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3706 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::TABLE_NAME; } break; case 292: /* Line 1792 of yacc.c */ -#line 3703 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3708 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::COLUMN_NAME; } break; case 293: /* Line 1792 of yacc.c */ -#line 3705 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3710 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::CURSOR_NAME; } break; case 294: /* Line 1792 of yacc.c */ -#line 3707 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3712 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::MESSAGE_TEXT; } break; case 295: /* Line 1792 of yacc.c */ -#line 3709 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3714 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::MYSQL_ERRNO; } break; case 296: /* Line 1792 of yacc.c */ -#line 3711 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3716 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cond_info_item_name)= Condition_information_item::RETURNED_SQLSTATE; } break; case 297: /* Line 1792 of yacc.c */ -#line 3716 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3721 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* NOTE: field definition is filled in sp_decl section. */ @@ -20758,7 +20763,7 @@ case 298: /* Line 1792 of yacc.c */ -#line 3736 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3741 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* NOTE: field definition is filled in sp_decl section. */ @@ -20782,31 +20787,31 @@ case 299: /* Line 1792 of yacc.c */ -#line 3759 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3764 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = NULL; } break; case 300: /* Line 1792 of yacc.c */ -#line 3761 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3766 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sphead->m_parser_data.push_expr_start_ptr(YY_TOKEN_END); } break; case 301: /* Line 1792 of yacc.c */ -#line 3763 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3768 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = (yyvsp[(3) - (3)].item); } break; case 315: /* Line 1792 of yacc.c */ -#line 3784 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3789 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sphead->m_parser_data.new_cont_backpatch(); } break; case 316: /* Line 1792 of yacc.c */ -#line 3786 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3791 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { sp_head *sp= Lex->sphead; @@ -20816,7 +20821,7 @@ case 317: /* Line 1792 of yacc.c */ -#line 3794 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3799 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20830,7 +20835,7 @@ case 318: /* Line 1792 of yacc.c */ -#line 3804 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3809 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20878,7 +20883,7 @@ case 319: /* Line 1792 of yacc.c */ -#line 3851 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3856 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20892,7 +20897,7 @@ case 320: /* Line 1792 of yacc.c */ -#line 3861 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3866 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20940,7 +20945,7 @@ case 321: /* Line 1792 of yacc.c */ -#line 3907 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3912 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Unlabeled controls get a secret label. */ THD *thd= YYTHD; LEX *lex= thd->lex; @@ -20955,7 +20960,7 @@ case 322: /* Line 1792 of yacc.c */ -#line 3918 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3923 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -20968,7 +20973,7 @@ case 323: /* Line 1792 of yacc.c */ -#line 3930 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3935 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21028,7 +21033,7 @@ case 324: /* Line 1792 of yacc.c */ -#line 3989 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 3994 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21079,7 +21084,7 @@ case 325: /* Line 1792 of yacc.c */ -#line 4039 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4044 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21104,7 +21109,7 @@ case 326: /* Line 1792 of yacc.c */ -#line 4063 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4068 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21129,13 +21134,13 @@ case 327: /* Line 1792 of yacc.c */ -#line 4084 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4089 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 328: /* Line 1792 of yacc.c */ -#line 4089 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4094 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21160,7 +21165,7 @@ case 332: /* Line 1792 of yacc.c */ -#line 4119 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4124 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21182,7 +21187,7 @@ case 333: /* Line 1792 of yacc.c */ -#line 4137 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4142 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21204,7 +21209,7 @@ case 334: /* Line 1792 of yacc.c */ -#line 4157 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4162 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21217,7 +21222,7 @@ case 335: /* Line 1792 of yacc.c */ -#line 4166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21257,7 +21262,7 @@ case 336: /* Line 1792 of yacc.c */ -#line 4202 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4207 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21280,7 +21285,7 @@ case 337: /* Line 1792 of yacc.c */ -#line 4221 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4226 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21293,7 +21298,7 @@ case 343: /* Line 1792 of yacc.c */ -#line 4244 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4249 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21308,7 +21313,7 @@ case 344: /* Line 1792 of yacc.c */ -#line 4255 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4260 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21353,7 +21358,7 @@ case 345: /* Line 1792 of yacc.c */ -#line 4299 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4304 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { case_stmt_action_end_case(Lex, true); } @@ -21361,7 +21366,7 @@ case 346: /* Line 1792 of yacc.c */ -#line 4306 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4311 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { case_stmt_action_case(YYTHD); } @@ -21369,7 +21374,7 @@ case 347: /* Line 1792 of yacc.c */ -#line 4313 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4318 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { case_stmt_action_end_case(Lex, false); } @@ -21377,7 +21382,7 @@ case 352: /* Line 1792 of yacc.c */ -#line 4330 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4335 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21390,7 +21395,7 @@ case 353: /* Line 1792 of yacc.c */ -#line 4339 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Simple case: = */ @@ -21434,7 +21439,7 @@ case 354: /* Line 1792 of yacc.c */ -#line 4380 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4385 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (case_stmt_action_then(YYTHD, Lex)) MYSQL_YYABORT; @@ -21443,7 +21448,7 @@ case 355: /* Line 1792 of yacc.c */ -#line 4388 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4393 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21456,7 +21461,7 @@ case 356: /* Line 1792 of yacc.c */ -#line 4397 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4402 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21495,7 +21500,7 @@ case 357: /* Line 1792 of yacc.c */ -#line 4433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (case_stmt_action_then(YYTHD, Lex)) MYSQL_YYABORT; @@ -21504,7 +21509,7 @@ case 358: /* Line 1792 of yacc.c */ -#line 4441 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4446 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21522,7 +21527,7 @@ case 360: /* Line 1792 of yacc.c */ -#line 4459 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4464 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21544,7 +21549,7 @@ case 361: /* Line 1792 of yacc.c */ -#line 4477 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4482 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21565,19 +21570,19 @@ case 362: /* Line 1792 of yacc.c */ -#line 4496 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4501 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= null_lex_str; } break; case 363: /* Line 1792 of yacc.c */ -#line 4497 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4502 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 364: /* Line 1792 of yacc.c */ -#line 4502 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4507 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21597,7 +21602,7 @@ case 365: /* Line 1792 of yacc.c */ -#line 4518 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4523 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); @@ -21616,7 +21621,7 @@ case 366: /* Line 1792 of yacc.c */ -#line 4535 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4540 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Unlabeled blocks get a secret label. */ LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -21631,7 +21636,7 @@ case 367: /* Line 1792 of yacc.c */ -#line 4546 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4551 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->get_sp_current_parsing_ctx()->pop_label(); @@ -21640,7 +21645,7 @@ case 368: /* Line 1792 of yacc.c */ -#line 4554 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4559 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* QQ This is just a dummy for grouping declarations and statements together. No [[NOT] ATOMIC] yet, and we need to figure out how make it coexist with the existing BEGIN COMMIT/ROLLBACK. */ @@ -21657,7 +21662,7 @@ case 369: /* Line 1792 of yacc.c */ -#line 4569 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4574 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21693,7 +21698,7 @@ case 370: /* Line 1792 of yacc.c */ -#line 4605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21712,7 +21717,7 @@ case 371: /* Line 1792 of yacc.c */ -#line 4620 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4625 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21725,7 +21730,7 @@ case 372: /* Line 1792 of yacc.c */ -#line 4629 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4634 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21765,7 +21770,7 @@ case 373: /* Line 1792 of yacc.c */ -#line 4667 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4672 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -21785,7 +21790,7 @@ case 374: /* Line 1792 of yacc.c */ -#line 4683 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4688 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21798,7 +21803,7 @@ case 375: /* Line 1792 of yacc.c */ -#line 4692 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4697 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -21839,43 +21844,43 @@ case 377: /* Line 1792 of yacc.c */ -#line 4733 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4738 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TRG_ACTION_BEFORE; } break; case 378: /* Line 1792 of yacc.c */ -#line 4735 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4740 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TRG_ACTION_AFTER; } break; case 379: /* Line 1792 of yacc.c */ -#line 4740 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4745 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TRG_EVENT_INSERT; } break; case 380: /* Line 1792 of yacc.c */ -#line 4742 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4747 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TRG_EVENT_UPDATE; } break; case 381: /* Line 1792 of yacc.c */ -#line 4744 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4749 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TRG_EVENT_DELETE; } break; case 385: /* Line 1792 of yacc.c */ -#line 4778 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4783 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 386: /* Line 1792 of yacc.c */ -#line 4780 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4785 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->logfile_group_name= (yyvsp[(4) - (4)].lex_str).str; @@ -21884,7 +21889,7 @@ case 387: /* Line 1792 of yacc.c */ -#line 4790 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4795 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_ADD_FILE; } @@ -21892,7 +21897,7 @@ case 388: /* Line 1792 of yacc.c */ -#line 4796 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4801 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_DROP_FILE; } @@ -21900,13 +21905,13 @@ case 393: /* Line 1792 of yacc.c */ -#line 4819 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4824 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 444: /* Line 1792 of yacc.c */ -#line 4917 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4922 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->data_file_name= (yyvsp[(2) - (2)].lex_str).str; @@ -21915,7 +21920,7 @@ case 445: /* Line 1792 of yacc.c */ -#line 4925 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4930 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->undo_file_name= (yyvsp[(2) - (2)].lex_str).str; @@ -21924,7 +21929,7 @@ case 446: /* Line 1792 of yacc.c */ -#line 4933 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4938 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->redo_file_name= (yyvsp[(2) - (2)].lex_str).str; @@ -21933,7 +21938,7 @@ case 447: /* Line 1792 of yacc.c */ -#line 4941 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4946 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info= new st_alter_tablespace(); @@ -21946,7 +21951,7 @@ case 448: /* Line 1792 of yacc.c */ -#line 4953 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4958 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info= new st_alter_tablespace(); @@ -21959,7 +21964,7 @@ case 449: /* Line 1792 of yacc.c */ -#line 4965 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4970 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_access_mode= TS_READ_ONLY; @@ -21968,7 +21973,7 @@ case 450: /* Line 1792 of yacc.c */ -#line 4970 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4975 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_access_mode= TS_READ_WRITE; @@ -21977,7 +21982,7 @@ case 451: /* Line 1792 of yacc.c */ -#line 4975 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4980 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_access_mode= TS_NOT_ACCESSIBLE; @@ -21986,7 +21991,7 @@ case 452: /* Line 1792 of yacc.c */ -#line 4983 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4988 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->initial_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -21995,7 +22000,7 @@ case 453: /* Line 1792 of yacc.c */ -#line 4991 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 4996 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->autoextend_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -22004,7 +22009,7 @@ case 454: /* Line 1792 of yacc.c */ -#line 4999 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5004 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->max_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -22013,7 +22018,7 @@ case 455: /* Line 1792 of yacc.c */ -#line 5007 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5012 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->extent_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -22022,7 +22027,7 @@ case 456: /* Line 1792 of yacc.c */ -#line 5015 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5020 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->undo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -22031,7 +22036,7 @@ case 457: /* Line 1792 of yacc.c */ -#line 5023 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5028 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->redo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number); @@ -22040,7 +22045,7 @@ case 458: /* Line 1792 of yacc.c */ -#line 5031 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5036 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->alter_tablespace_info->nodegroup_id != UNDEF_NODEGROUP) @@ -22054,7 +22059,7 @@ case 459: /* Line 1792 of yacc.c */ -#line 5044 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5049 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->alter_tablespace_info->ts_comment != NULL) @@ -22068,7 +22073,7 @@ case 460: /* Line 1792 of yacc.c */ -#line 5057 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5062 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->alter_tablespace_info->storage_engine != NULL) @@ -22083,7 +22088,7 @@ case 461: /* Line 1792 of yacc.c */ -#line 5071 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5076 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->wait_until_completed= TRUE; @@ -22092,7 +22097,7 @@ case 462: /* Line 1792 of yacc.c */ -#line 5076 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5081 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (!(lex->alter_tablespace_info->wait_until_completed)) @@ -22106,13 +22111,13 @@ case 463: /* Line 1792 of yacc.c */ -#line 5088 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5093 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulonglong_number)= (yyvsp[(1) - (1)].ulonglong_number);} break; case 464: /* Line 1792 of yacc.c */ -#line 5090 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5095 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { ulonglong number; uint text_shift_number= 0; @@ -22160,19 +22165,19 @@ case 465: /* Line 1792 of yacc.c */ -#line 5140 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5145 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 466: /* Line 1792 of yacc.c */ -#line 5143 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5148 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 467: /* Line 1792 of yacc.c */ -#line 5145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; TABLE_LIST *src_table; @@ -22191,7 +22196,7 @@ case 468: /* Line 1792 of yacc.c */ -#line 5160 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5165 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; TABLE_LIST *src_table; @@ -22210,55 +22215,55 @@ case 469: /* Line 1792 of yacc.c */ -#line 5179 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5184 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 470: /* Line 1792 of yacc.c */ -#line 5182 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5187 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_braces(1);} break; case 471: /* Line 1792 of yacc.c */ -#line 5183 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5188 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 472: /* Line 1792 of yacc.c */ -#line 5187 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5192 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 473: /* Line 1792 of yacc.c */ -#line 5189 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5194 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_braces(0);} break; case 474: /* Line 1792 of yacc.c */ -#line 5190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 475: /* Line 1792 of yacc.c */ -#line 5192 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5197 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_braces(1);} break; case 476: /* Line 1792 of yacc.c */ -#line 5193 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5198 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 477: /* Line 1792 of yacc.c */ -#line 5198 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5203 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Remove all tables used in PARTITION clause from the global table @@ -22272,13 +22277,13 @@ case 478: /* Line 1792 of yacc.c */ -#line 5234 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5239 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 480: /* Line 1792 of yacc.c */ -#line 5240 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5245 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->part_info= new partition_info(); @@ -22296,7 +22301,7 @@ case 482: /* Line 1792 of yacc.c */ -#line 5258 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5263 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef WITH_PARTITION_STORAGE_ENGINE LEX_STRING partition_name={C_STRING_WITH_LEN("partition")}; @@ -22316,7 +22321,7 @@ case 483: /* Line 1792 of yacc.c */ -#line 5277 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5282 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (!lex->part_info) @@ -22333,13 +22338,13 @@ case 484: /* Line 1792 of yacc.c */ -#line 5289 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5294 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 486: /* Line 1792 of yacc.c */ -#line 5298 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5303 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->list_of_part_fields= TRUE; @@ -22350,61 +22355,61 @@ case 487: /* Line 1792 of yacc.c */ -#line 5305 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5310 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->part_type= HASH_PARTITION; } break; case 488: /* Line 1792 of yacc.c */ -#line 5306 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5311 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 489: /* Line 1792 of yacc.c */ -#line 5308 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5313 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->part_type= RANGE_PARTITION; } break; case 490: /* Line 1792 of yacc.c */ -#line 5310 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5315 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->part_type= RANGE_PARTITION; } break; case 491: /* Line 1792 of yacc.c */ -#line 5312 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5317 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->part_type= LIST_PARTITION; } break; case 492: /* Line 1792 of yacc.c */ -#line 5314 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5319 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->part_type= LIST_PARTITION; } break; case 493: /* Line 1792 of yacc.c */ -#line 5318 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5323 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 494: /* Line 1792 of yacc.c */ -#line 5320 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5325 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->linear_hash_ind= TRUE;} break; case 495: /* Line 1792 of yacc.c */ -#line 5325 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5330 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->key_algorithm= partition_info::KEY_ALGORITHM_NONE;} break; case 496: /* Line 1792 of yacc.c */ -#line 5327 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5332 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { switch ((yyvsp[(3) - (3)].ulong_num)) { case 1: @@ -22422,31 +22427,31 @@ case 497: /* Line 1792 of yacc.c */ -#line 5343 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5348 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 498: /* Line 1792 of yacc.c */ -#line 5344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 499: /* Line 1792 of yacc.c */ -#line 5348 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5353 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 500: /* Line 1792 of yacc.c */ -#line 5349 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5354 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 501: /* Line 1792 of yacc.c */ -#line 5354 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5359 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->num_columns++; @@ -22466,7 +22471,7 @@ case 502: /* Line 1792 of yacc.c */ -#line 5373 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5378 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->column_list= TRUE; @@ -22476,7 +22481,7 @@ case 503: /* Line 1792 of yacc.c */ -#line 5383 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5388 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), FALSE)) @@ -22488,7 +22493,7 @@ case 504: /* Line 1792 of yacc.c */ -#line 5394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5399 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), TRUE)) { MYSQL_YYABORT; } @@ -22497,13 +22502,13 @@ case 505: /* Line 1792 of yacc.c */ -#line 5402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 506: /* Line 1792 of yacc.c */ -#line 5404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { uint num_parts= (yyvsp[(2) - (2)].ulong_num); partition_info *part_info= Lex->part_info; @@ -22520,25 +22525,25 @@ case 507: /* Line 1792 of yacc.c */ -#line 5419 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5424 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 508: /* Line 1792 of yacc.c */ -#line 5421 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5426 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->subpart_type= HASH_PARTITION; } break; case 509: /* Line 1792 of yacc.c */ -#line 5422 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5427 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 510: /* Line 1792 of yacc.c */ -#line 5425 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5430 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->subpart_type= HASH_PARTITION; @@ -22548,25 +22553,25 @@ case 511: /* Line 1792 of yacc.c */ -#line 5430 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5435 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 512: /* Line 1792 of yacc.c */ -#line 5434 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5439 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 513: /* Line 1792 of yacc.c */ -#line 5435 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5440 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 514: /* Line 1792 of yacc.c */ -#line 5440 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5445 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->subpart_field_list.push_back((yyvsp[(1) - (1)].lex_str).str)) @@ -22585,7 +22590,7 @@ case 515: /* Line 1792 of yacc.c */ -#line 5458 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5463 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; bool not_corr_func; @@ -22602,13 +22607,13 @@ case 516: /* Line 1792 of yacc.c */ -#line 5473 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5478 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 517: /* Line 1792 of yacc.c */ -#line 5475 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5480 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { uint num_parts= (yyvsp[(2) - (2)].ulong_num); LEX *lex= Lex; @@ -22624,7 +22629,7 @@ case 518: /* Line 1792 of yacc.c */ -#line 5490 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5495 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->part_type == RANGE_PARTITION) @@ -22644,7 +22649,7 @@ case 519: /* Line 1792 of yacc.c */ -#line 5506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; uint count_curr_parts= part_info->partitions.elements; @@ -22667,19 +22672,19 @@ case 520: /* Line 1792 of yacc.c */ -#line 5527 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5532 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 521: /* Line 1792 of yacc.c */ -#line 5528 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5533 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 522: /* Line 1792 of yacc.c */ -#line 5533 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5538 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; partition_element *p_elem= new partition_element(); @@ -22699,13 +22704,13 @@ case 523: /* Line 1792 of yacc.c */ -#line 5552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 524: /* Line 1792 of yacc.c */ -#line 5557 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5562 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; partition_element *p_elem= part_info->curr_part_elem; @@ -22715,7 +22720,7 @@ case 525: /* Line 1792 of yacc.c */ -#line 5566 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5571 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -22741,7 +22746,7 @@ case 526: /* Line 1792 of yacc.c */ -#line 5588 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5593 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -22761,13 +22766,13 @@ case 527: /* Line 1792 of yacc.c */ -#line 5603 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5608 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 528: /* Line 1792 of yacc.c */ -#line 5605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -22787,13 +22792,13 @@ case 529: /* Line 1792 of yacc.c */ -#line 5620 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5625 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 530: /* Line 1792 of yacc.c */ -#line 5625 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5630 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; @@ -22819,13 +22824,13 @@ case 531: /* Line 1792 of yacc.c */ -#line 5646 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5651 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 532: /* Line 1792 of yacc.c */ -#line 5651 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5656 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -22858,7 +22863,7 @@ case 533: /* Line 1792 of yacc.c */ -#line 5680 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5685 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->num_columns < 2U) @@ -22871,19 +22876,19 @@ case 534: /* Line 1792 of yacc.c */ -#line 5691 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5696 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 535: /* Line 1792 of yacc.c */ -#line 5692 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5697 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 536: /* Line 1792 of yacc.c */ -#line 5697 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5702 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->print_debug("( part_value_item", NULL); @@ -22899,13 +22904,13 @@ case 537: /* Line 1792 of yacc.c */ -#line 5708 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5713 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 538: /* Line 1792 of yacc.c */ -#line 5710 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5715 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->print_debug(") part_value_item", NULL); @@ -22930,19 +22935,19 @@ case 539: /* Line 1792 of yacc.c */ -#line 5733 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5738 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 540: /* Line 1792 of yacc.c */ -#line 5734 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5739 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 541: /* Line 1792 of yacc.c */ -#line 5739 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5744 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->part_type == LIST_PARTITION) @@ -22959,7 +22964,7 @@ case 542: /* Line 1792 of yacc.c */ -#line 5752 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5757 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -22979,7 +22984,7 @@ case 543: /* Line 1792 of yacc.c */ -#line 5772 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5777 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->num_subparts != 0 && @@ -22997,7 +23002,7 @@ case 544: /* Line 1792 of yacc.c */ -#line 5786 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5791 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; if (part_info->num_subparts != 0) @@ -23024,19 +23029,19 @@ case 545: /* Line 1792 of yacc.c */ -#line 5811 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5816 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 546: /* Line 1792 of yacc.c */ -#line 5812 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5817 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 547: /* Line 1792 of yacc.c */ -#line 5817 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5822 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; partition_element *curr_part= part_info->current_partition; @@ -23073,49 +23078,49 @@ case 548: /* Line 1792 of yacc.c */ -#line 5849 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5854 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 549: /* Line 1792 of yacc.c */ -#line 5854 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5859 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->partition_name= (yyvsp[(1) - (1)].lex_str).str; } break; case 550: /* Line 1792 of yacc.c */ -#line 5858 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5863 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 551: /* Line 1792 of yacc.c */ -#line 5859 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5864 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 552: /* Line 1792 of yacc.c */ -#line 5863 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5868 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 553: /* Line 1792 of yacc.c */ -#line 5864 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5869 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 554: /* Line 1792 of yacc.c */ -#line 5869 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5874 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->tablespace_name= (yyvsp[(3) - (3)].lex_str).str; } break; case 555: /* Line 1792 of yacc.c */ -#line 5871 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5876 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->curr_part_elem->engine_type= (yyvsp[(4) - (4)].db_type); @@ -23125,43 +23130,43 @@ case 556: /* Line 1792 of yacc.c */ -#line 5877 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5882 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->nodegroup_id= (uint16) (yyvsp[(3) - (3)].ulong_num); } break; case 557: /* Line 1792 of yacc.c */ -#line 5879 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5884 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->part_max_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); } break; case 558: /* Line 1792 of yacc.c */ -#line 5881 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5886 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->part_min_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); } break; case 559: /* Line 1792 of yacc.c */ -#line 5883 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5888 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->data_file_name= (yyvsp[(4) - (4)].lex_str).str; } break; case 560: /* Line 1792 of yacc.c */ -#line 5885 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5890 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->index_file_name= (yyvsp[(4) - (4)].lex_str).str; } break; case 561: /* Line 1792 of yacc.c */ -#line 5887 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5892 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->curr_part_elem->part_comment= (yyvsp[(3) - (3)].lex_str).str; } break; case 562: /* Line 1792 of yacc.c */ -#line 5896 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5901 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->sql_command == SQLCOM_INSERT) @@ -23180,7 +23185,7 @@ case 563: /* Line 1792 of yacc.c */ -#line 5911 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5916 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -23188,7 +23193,7 @@ case 564: /* Line 1792 of yacc.c */ -#line 5915 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5920 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* The following work only with the local list, the global list @@ -23200,97 +23205,97 @@ case 565: /* Line 1792 of yacc.c */ -#line 5925 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5930 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 566: /* Line 1792 of yacc.c */ -#line 5926 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5931 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 567: /* Line 1792 of yacc.c */ -#line 5930 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5935 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 568: /* Line 1792 of yacc.c */ -#line 5931 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5936 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 569: /* Line 1792 of yacc.c */ -#line 5935 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5940 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 570: /* Line 1792 of yacc.c */ -#line 5936 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5941 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 571: /* Line 1792 of yacc.c */ -#line 5940 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5945 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 572: /* Line 1792 of yacc.c */ -#line 5941 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5946 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 573: /* Line 1792 of yacc.c */ -#line 5945 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5950 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 574: /* Line 1792 of yacc.c */ -#line 5946 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5951 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (1)].num);} break; case 575: /* Line 1792 of yacc.c */ -#line 5950 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5955 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=(yyvsp[(1) - (1)].num); } break; case 576: /* Line 1792 of yacc.c */ -#line 5951 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5956 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } break; case 577: /* Line 1792 of yacc.c */ -#line 5955 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5960 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=HA_LEX_CREATE_TMP_TABLE; } break; case 578: /* Line 1792 of yacc.c */ -#line 5959 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5964 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 579: /* Line 1792 of yacc.c */ -#line 5960 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5965 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=HA_LEX_CREATE_IF_NOT_EXISTS; } break; case 587: /* Line 1792 of yacc.c */ -#line 5981 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5986 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.db_type= (yyvsp[(3) - (3)].db_type); Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; @@ -23299,7 +23304,7 @@ case 588: /* Line 1792 of yacc.c */ -#line 5986 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5991 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.max_rows= (yyvsp[(3) - (3)].ulonglong_number); Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS; @@ -23308,7 +23313,7 @@ case 589: /* Line 1792 of yacc.c */ -#line 5991 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 5996 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.min_rows= (yyvsp[(3) - (3)].ulonglong_number); Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS; @@ -23317,7 +23322,7 @@ case 590: /* Line 1792 of yacc.c */ -#line 5996 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6001 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.avg_row_length=(yyvsp[(3) - (3)].ulong_num); Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH; @@ -23326,7 +23331,7 @@ case 591: /* Line 1792 of yacc.c */ -#line 6001 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6006 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.password=(yyvsp[(3) - (3)].lex_str).str; Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD; @@ -23335,7 +23340,7 @@ case 592: /* Line 1792 of yacc.c */ -#line 6006 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6011 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.comment=(yyvsp[(3) - (3)].lex_str); Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT; @@ -23344,7 +23349,7 @@ case 593: /* Line 1792 of yacc.c */ -#line 6011 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6016 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.auto_increment_value=(yyvsp[(3) - (3)].ulonglong_number); Lex->create_info.used_fields|= HA_CREATE_USED_AUTO; @@ -23353,7 +23358,7 @@ case 594: /* Line 1792 of yacc.c */ -#line 6016 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6021 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { switch((yyvsp[(3) - (3)].ulong_num)) { case 0: @@ -23372,7 +23377,7 @@ case 595: /* Line 1792 of yacc.c */ -#line 6031 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6036 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.table_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS); @@ -23382,7 +23387,7 @@ case 596: /* Line 1792 of yacc.c */ -#line 6037 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6042 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { switch((yyvsp[(3) - (3)].ulong_num)) { case 0: @@ -23401,7 +23406,7 @@ case 597: /* Line 1792 of yacc.c */ -#line 6052 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6057 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.stats_auto_recalc= HA_STATS_AUTO_RECALC_DEFAULT; Lex->create_info.used_fields|= HA_CREATE_USED_STATS_AUTO_RECALC; @@ -23410,7 +23415,7 @@ case 598: /* Line 1792 of yacc.c */ -#line 6057 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6062 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { switch((yyvsp[(3) - (3)].ulong_num)) { case 0: @@ -23429,7 +23434,7 @@ case 599: /* Line 1792 of yacc.c */ -#line 6072 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6077 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.table_options&= ~(HA_OPTION_STATS_PERSISTENT | HA_OPTION_NO_STATS_PERSISTENT); @@ -23439,7 +23444,7 @@ case 600: /* Line 1792 of yacc.c */ -#line 6078 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6083 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* From user point of view STATS_SAMPLE_PAGES can be specified as STATS_SAMPLE_PAGES=N (where 0create_info.stats_sample_pages=0; Lex->create_info.used_fields|= HA_CREATE_USED_STATS_SAMPLE_PAGES; @@ -23470,7 +23475,7 @@ case 602: /* Line 1792 of yacc.c */ -#line 6101 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6106 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM; @@ -23479,7 +23484,7 @@ case 603: /* Line 1792 of yacc.c */ -#line 6106 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6111 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM; @@ -23488,7 +23493,7 @@ case 604: /* Line 1792 of yacc.c */ -#line 6111 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6116 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE; Lex->create_info.used_fields|= HA_CREATE_USED_DELAY_KEY_WRITE; @@ -23497,7 +23502,7 @@ case 605: /* Line 1792 of yacc.c */ -#line 6116 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6121 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.row_type= (yyvsp[(3) - (3)].row_type); Lex->create_info.used_fields|= HA_CREATE_USED_ROW_FORMAT; @@ -23506,7 +23511,7 @@ case 606: /* Line 1792 of yacc.c */ -#line 6121 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6126 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->select_lex.table_list.save_and_clear(&Lex->save_list); } @@ -23514,7 +23519,7 @@ case 607: /* Line 1792 of yacc.c */ -#line 6125 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6130 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Move the union list to the merge_list and exclude its tables @@ -23540,7 +23545,7 @@ case 610: /* Line 1792 of yacc.c */ -#line 6149 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6154 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.merge_insert_method= (yyvsp[(3) - (3)].ulong_num); Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD; @@ -23549,7 +23554,7 @@ case 611: /* Line 1792 of yacc.c */ -#line 6154 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6159 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.data_file_name= (yyvsp[(4) - (4)].lex_str).str; Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR; @@ -23558,7 +23563,7 @@ case 612: /* Line 1792 of yacc.c */ -#line 6159 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6164 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.index_file_name= (yyvsp[(4) - (4)].lex_str).str; Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR; @@ -23567,25 +23572,25 @@ case 613: /* Line 1792 of yacc.c */ -#line 6164 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6169 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {Lex->create_info.tablespace= (yyvsp[(2) - (2)].lex_str).str;} break; case 614: /* Line 1792 of yacc.c */ -#line 6166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {Lex->create_info.storage_media= HA_SM_DISK;} break; case 615: /* Line 1792 of yacc.c */ -#line 6168 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6173 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {Lex->create_info.storage_media= HA_SM_MEMORY;} break; case 616: /* Line 1792 of yacc.c */ -#line 6170 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.connect_string.str= (yyvsp[(3) - (3)].lex_str).str; Lex->create_info.connect_string.length= (yyvsp[(3) - (3)].lex_str).length; @@ -23595,7 +23600,7 @@ case 617: /* Line 1792 of yacc.c */ -#line 6176 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6181 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE; Lex->create_info.key_block_size= (yyvsp[(3) - (3)].ulong_num); @@ -23604,7 +23609,7 @@ case 618: /* Line 1792 of yacc.c */ -#line 6184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { HA_CREATE_INFO *cinfo= &Lex->create_info; if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) && @@ -23623,7 +23628,7 @@ case 619: /* Line 1792 of yacc.c */ -#line 6202 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6207 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { HA_CREATE_INFO *cinfo= &Lex->create_info; if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) && @@ -23641,7 +23646,7 @@ case 620: /* Line 1792 of yacc.c */ -#line 6219 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6224 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; plugin_ref plugin= @@ -23668,7 +23673,7 @@ case 621: /* Line 1792 of yacc.c */ -#line 6245 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6250 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -23687,91 +23692,91 @@ case 622: /* Line 1792 of yacc.c */ -#line 6262 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6267 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_DEFAULT; } break; case 623: /* Line 1792 of yacc.c */ -#line 6263 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6268 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_FIXED; } break; case 624: /* Line 1792 of yacc.c */ -#line 6264 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6269 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_DYNAMIC; } break; case 625: /* Line 1792 of yacc.c */ -#line 6265 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6270 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_COMPRESSED; } break; case 626: /* Line 1792 of yacc.c */ -#line 6266 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6271 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_REDUNDANT; } break; case 627: /* Line 1792 of yacc.c */ -#line 6267 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6272 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.row_type)= ROW_TYPE_COMPACT; } break; case 628: /* Line 1792 of yacc.c */ -#line 6271 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6276 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= MERGE_INSERT_DISABLED; } break; case 629: /* Line 1792 of yacc.c */ -#line 6272 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; } break; case 630: /* Line 1792 of yacc.c */ -#line 6273 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6278 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= MERGE_INSERT_TO_LAST; } break; case 631: /* Line 1792 of yacc.c */ -#line 6277 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6282 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 633: /* Line 1792 of yacc.c */ -#line 6282 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6287 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.num) = (int) STRING_RESULT; } break; case 634: /* Line 1792 of yacc.c */ -#line 6283 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6288 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.num) = (int) REAL_RESULT; } break; case 635: /* Line 1792 of yacc.c */ -#line 6284 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6289 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.num) = (int) DECIMAL_RESULT; } break; case 636: /* Line 1792 of yacc.c */ -#line 6285 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6290 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.num) = (int) INT_RESULT; } break; case 637: /* Line 1792 of yacc.c */ -#line 6291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6296 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_last_non_select_table= Lex->last_table(); } @@ -23779,7 +23784,7 @@ case 643: /* Line 1792 of yacc.c */ -#line 6309 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6314 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->col_list.empty(); /* Alloced by sql_alloc */ } @@ -23787,7 +23792,7 @@ case 644: /* Line 1792 of yacc.c */ -#line 6316 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6321 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index (Lex, (yyvsp[(1) - (7)].key_type), (yyvsp[(2) - (7)].lex_str))) MYSQL_YYABORT; @@ -23796,7 +23801,7 @@ case 645: /* Line 1792 of yacc.c */ -#line 6322 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6327 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str))) MYSQL_YYABORT; @@ -23805,7 +23810,7 @@ case 646: /* Line 1792 of yacc.c */ -#line 6328 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6333 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str))) MYSQL_YYABORT; @@ -23814,7 +23819,7 @@ case 647: /* Line 1792 of yacc.c */ -#line 6334 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6339 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_create_index (Lex, (yyvsp[(2) - (8)].key_type), (yyvsp[(3) - (8)].lex_str).str ? (yyvsp[(3) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str))) MYSQL_YYABORT; @@ -23823,7 +23828,7 @@ case 648: /* Line 1792 of yacc.c */ -#line 6339 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Key *key= new Foreign_key((yyvsp[(4) - (8)].lex_str).str ? (yyvsp[(4) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str), lex->col_list, @@ -23846,7 +23851,7 @@ case 649: /* Line 1792 of yacc.c */ -#line 6358 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6363 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->col_list.empty(); /* Alloced by sql_alloc */ } @@ -23854,25 +23859,25 @@ case 653: /* Line 1792 of yacc.c */ -#line 6373 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6378 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= null_lex_str; } break; case 654: /* Line 1792 of yacc.c */ -#line 6374 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6379 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 655: /* Line 1792 of yacc.c */ -#line 6378 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6383 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); } break; case 656: /* Line 1792 of yacc.c */ -#line 6383 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6388 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->length=lex->dec=0; @@ -23885,7 +23890,7 @@ case 657: /* Line 1792 of yacc.c */ -#line 6392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (add_field_to_list(lex->thd, &(yyvsp[(1) - (4)].lex_str), (enum enum_field_types) (yyvsp[(3) - (4)].num), @@ -23900,25 +23905,25 @@ case 658: /* Line 1792 of yacc.c */ -#line 6405 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6410 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=(yyvsp[(1) - (3)].num); } break; case 659: /* Line 1792 of yacc.c */ -#line 6406 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6411 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=(yyvsp[(1) - (3)].num); } break; case 660: /* Line 1792 of yacc.c */ -#line 6407 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6412 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_FLOAT; } break; case 661: /* Line 1792 of yacc.c */ -#line 6409 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6414 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; (yyval.num)=MYSQL_TYPE_BIT; @@ -23927,7 +23932,7 @@ case 662: /* Line 1792 of yacc.c */ -#line 6414 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6419 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_BIT; } @@ -23935,7 +23940,7 @@ case 663: /* Line 1792 of yacc.c */ -#line 6418 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6423 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; (yyval.num)=MYSQL_TYPE_TINY; @@ -23944,7 +23949,7 @@ case 664: /* Line 1792 of yacc.c */ -#line 6423 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6428 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; (yyval.num)=MYSQL_TYPE_TINY; @@ -23953,7 +23958,7 @@ case 665: /* Line 1792 of yacc.c */ -#line 6428 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6433 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_STRING; } @@ -23961,7 +23966,7 @@ case 666: /* Line 1792 of yacc.c */ -#line 6432 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6437 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; (yyval.num)=MYSQL_TYPE_STRING; @@ -23970,7 +23975,7 @@ case 667: /* Line 1792 of yacc.c */ -#line 6437 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6442 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_STRING; Lex->charset=national_charset_info; @@ -23979,7 +23984,7 @@ case 668: /* Line 1792 of yacc.c */ -#line 6442 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6447 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; (yyval.num)=MYSQL_TYPE_STRING; @@ -23989,7 +23994,7 @@ case 669: /* Line 1792 of yacc.c */ -#line 6448 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6453 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_STRING; @@ -23998,7 +24003,7 @@ case 670: /* Line 1792 of yacc.c */ -#line 6453 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6458 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (char*) "1"; Lex->charset=&my_charset_bin; @@ -24008,7 +24013,7 @@ case 671: /* Line 1792 of yacc.c */ -#line 6459 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6464 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_TYPE_VARCHAR; } @@ -24016,7 +24021,7 @@ case 672: /* Line 1792 of yacc.c */ -#line 6463 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6468 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_TYPE_VARCHAR; Lex->charset=national_charset_info; @@ -24025,7 +24030,7 @@ case 673: /* Line 1792 of yacc.c */ -#line 6468 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6473 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)= MYSQL_TYPE_VARCHAR; @@ -24034,7 +24039,7 @@ case 674: /* Line 1792 of yacc.c */ -#line 6473 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6478 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->length) { @@ -24056,19 +24061,19 @@ case 675: /* Line 1792 of yacc.c */ -#line 6491 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6496 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_DATE; } break; case 676: /* Line 1792 of yacc.c */ -#line 6493 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6498 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_TYPE_TIME2; } break; case 677: /* Line 1792 of yacc.c */ -#line 6495 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6500 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (YYTHD->variables.sql_mode & MODE_MAXDB) (yyval.num)=MYSQL_TYPE_DATETIME2; @@ -24088,13 +24093,13 @@ case 678: /* Line 1792 of yacc.c */ -#line 6511 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6516 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_TYPE_DATETIME2; } break; case 679: /* Line 1792 of yacc.c */ -#line 6513 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6518 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_TINY_BLOB; @@ -24103,7 +24108,7 @@ case 680: /* Line 1792 of yacc.c */ -#line 6518 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6523 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_BLOB; @@ -24112,7 +24117,7 @@ case 681: /* Line 1792 of yacc.c */ -#line 6523 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6528 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_SPATIAL Lex->charset=&my_charset_bin; @@ -24128,7 +24133,7 @@ case 682: /* Line 1792 of yacc.c */ -#line 6535 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6540 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; @@ -24137,7 +24142,7 @@ case 683: /* Line 1792 of yacc.c */ -#line 6540 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6545 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_LONG_BLOB; @@ -24146,7 +24151,7 @@ case 684: /* Line 1792 of yacc.c */ -#line 6545 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6550 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; @@ -24155,85 +24160,85 @@ case 685: /* Line 1792 of yacc.c */ -#line 6550 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6555 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; } break; case 686: /* Line 1792 of yacc.c */ -#line 6552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_TINY_BLOB; } break; case 687: /* Line 1792 of yacc.c */ -#line 6554 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6559 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_BLOB; } break; case 688: /* Line 1792 of yacc.c */ -#line 6556 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6561 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; } break; case 689: /* Line 1792 of yacc.c */ -#line 6558 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6563 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_LONG_BLOB; } break; case 690: /* Line 1792 of yacc.c */ -#line 6560 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6565 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;} break; case 691: /* Line 1792 of yacc.c */ -#line 6562 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6567 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;} break; case 692: /* Line 1792 of yacc.c */ -#line 6564 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6569 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;} break; case 693: /* Line 1792 of yacc.c */ -#line 6566 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6571 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {Lex->interval_list.empty();} break; case 694: /* Line 1792 of yacc.c */ -#line 6568 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6573 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_ENUM; } break; case 695: /* Line 1792 of yacc.c */ -#line 6570 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6575 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->interval_list.empty();} break; case 696: /* Line 1792 of yacc.c */ -#line 6572 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6577 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_SET; } break; case 697: /* Line 1792 of yacc.c */ -#line 6574 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6579 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; } break; case 698: /* Line 1792 of yacc.c */ -#line 6576 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6581 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_LONGLONG; Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG | @@ -24243,19 +24248,19 @@ case 699: /* Line 1792 of yacc.c */ -#line 6584 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6589 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_GEOMETRY; } break; case 700: /* Line 1792 of yacc.c */ -#line 6585 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6590 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_GEOMETRYCOLLECTION; } break; case 701: /* Line 1792 of yacc.c */ -#line 6587 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6592 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= const_cast(STRINGIFY_ARG (MAX_LEN_GEOM_POINT_FIELD)); @@ -24265,127 +24270,127 @@ case 702: /* Line 1792 of yacc.c */ -#line 6592 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6597 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_MULTIPOINT; } break; case 703: /* Line 1792 of yacc.c */ -#line 6593 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6598 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_LINESTRING; } break; case 704: /* Line 1792 of yacc.c */ -#line 6594 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6599 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_MULTILINESTRING; } break; case 705: /* Line 1792 of yacc.c */ -#line 6595 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6600 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_POLYGON; } break; case 706: /* Line 1792 of yacc.c */ -#line 6596 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6601 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= Field::GEOM_MULTIPOLYGON; } break; case 707: /* Line 1792 of yacc.c */ -#line 6600 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6605 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 708: /* Line 1792 of yacc.c */ -#line 6604 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6609 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 709: /* Line 1792 of yacc.c */ -#line 6605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 710: /* Line 1792 of yacc.c */ -#line 6609 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6614 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 711: /* Line 1792 of yacc.c */ -#line 6610 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6615 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 712: /* Line 1792 of yacc.c */ -#line 6614 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6619 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 713: /* Line 1792 of yacc.c */ -#line 6615 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6620 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 714: /* Line 1792 of yacc.c */ -#line 6616 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6621 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 715: /* Line 1792 of yacc.c */ -#line 6617 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6622 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 716: /* Line 1792 of yacc.c */ -#line 6618 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6623 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 717: /* Line 1792 of yacc.c */ -#line 6622 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6627 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_LONG; } break; case 718: /* Line 1792 of yacc.c */ -#line 6623 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6628 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_TINY; } break; case 719: /* Line 1792 of yacc.c */ -#line 6624 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6629 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_SHORT; } break; case 720: /* Line 1792 of yacc.c */ -#line 6625 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6630 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_INT24; } break; case 721: /* Line 1792 of yacc.c */ -#line 6626 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6631 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_LONGLONG; } break; case 722: /* Line 1792 of yacc.c */ -#line 6631 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6636 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ? MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; @@ -24394,37 +24399,37 @@ case 723: /* Line 1792 of yacc.c */ -#line 6636 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6641 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_DOUBLE; } break; case 724: /* Line 1792 of yacc.c */ -#line 6638 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6643 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=MYSQL_TYPE_DOUBLE; } break; case 725: /* Line 1792 of yacc.c */ -#line 6643 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6648 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->dec=Lex->length= (char*)0; } break; case 726: /* Line 1792 of yacc.c */ -#line 6645 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6650 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->dec= (char*)0; } break; case 727: /* Line 1792 of yacc.c */ -#line 6647 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6652 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 728: /* Line 1792 of yacc.c */ -#line 6652 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6657 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->length=(yyvsp[(2) - (5)].lex_str).str; @@ -24434,31 +24439,31 @@ case 729: /* Line 1792 of yacc.c */ -#line 6661 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6666 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->dec= (char *) 0; } break; case 730: /* Line 1792 of yacc.c */ -#line 6662 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6667 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->dec= (yyvsp[(2) - (3)].lex_str).str; } break; case 731: /* Line 1792 of yacc.c */ -#line 6666 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6671 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 0; } break; case 732: /* Line 1792 of yacc.c */ -#line 6667 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6672 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 0; } break; case 733: /* Line 1792 of yacc.c */ -#line 6669 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6674 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(2) - (3)].lex_str).str, NULL, &error); @@ -24467,145 +24472,145 @@ case 734: /* Line 1792 of yacc.c */ -#line 6676 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6681 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 735: /* Line 1792 of yacc.c */ -#line 6677 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6682 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 736: /* Line 1792 of yacc.c */ -#line 6681 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6686 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 737: /* Line 1792 of yacc.c */ -#line 6682 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6687 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 738: /* Line 1792 of yacc.c */ -#line 6686 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6691 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 739: /* Line 1792 of yacc.c */ -#line 6687 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6692 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= UNSIGNED_FLAG;} break; case 740: /* Line 1792 of yacc.c */ -#line 6688 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6693 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; } break; case 741: /* Line 1792 of yacc.c */ -#line 6692 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6697 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (yyvsp[(2) - (3)].lex_str).str; } break; case 742: /* Line 1792 of yacc.c */ -#line 6693 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6698 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (yyvsp[(2) - (3)].lex_str).str; } break; case 743: /* Line 1792 of yacc.c */ -#line 6694 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6699 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (yyvsp[(2) - (3)].lex_str).str; } break; case 744: /* Line 1792 of yacc.c */ -#line 6695 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6700 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length= (yyvsp[(2) - (3)].lex_str).str; } break; case 745: /* Line 1792 of yacc.c */ -#line 6698 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6703 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->length=(char*) 0; /* use default length */ } break; case 746: /* Line 1792 of yacc.c */ -#line 6699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 747: /* Line 1792 of yacc.c */ -#line 6703 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6708 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 748: /* Line 1792 of yacc.c */ -#line 6704 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6709 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 749: /* Line 1792 of yacc.c */ -#line 6708 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6713 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 750: /* Line 1792 of yacc.c */ -#line 6709 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6714 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 751: /* Line 1792 of yacc.c */ -#line 6713 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6718 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 753: /* Line 1792 of yacc.c */ -#line 6718 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6723 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~ NOT_NULL_FLAG; } break; case 754: /* Line 1792 of yacc.c */ -#line 6719 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6724 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= NOT_NULL_FLAG; } break; case 755: /* Line 1792 of yacc.c */ -#line 6720 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6725 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->default_value=(yyvsp[(2) - (2)].item); } break; case 756: /* Line 1792 of yacc.c */ -#line 6721 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6726 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->on_update_value= (yyvsp[(3) - (3)].item); } break; case 757: /* Line 1792 of yacc.c */ -#line 6722 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6727 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG; } break; case 758: /* Line 1792 of yacc.c */ -#line 6724 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6729 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG; @@ -24615,7 +24620,7 @@ case 759: /* Line 1792 of yacc.c */ -#line 6730 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6735 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG; @@ -24625,7 +24630,7 @@ case 760: /* Line 1792 of yacc.c */ -#line 6736 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6741 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->type|= UNIQUE_FLAG; @@ -24635,7 +24640,7 @@ case 761: /* Line 1792 of yacc.c */ -#line 6742 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6747 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->type|= UNIQUE_KEY_FLAG; @@ -24645,13 +24650,13 @@ case 762: /* Line 1792 of yacc.c */ -#line 6747 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6752 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->comment= (yyvsp[(2) - (2)].lex_str); } break; case 763: /* Line 1792 of yacc.c */ -#line 6749 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6754 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->charset && !my_charset_same(Lex->charset,(yyvsp[(2) - (2)].charset))) { @@ -24668,7 +24673,7 @@ case 764: /* Line 1792 of yacc.c */ -#line 6762 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6767 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK); Lex->type|= @@ -24678,7 +24683,7 @@ case 765: /* Line 1792 of yacc.c */ -#line 6768 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6773 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK); Lex->type|= @@ -24688,7 +24693,7 @@ case 766: /* Line 1792 of yacc.c */ -#line 6774 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6779 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_COLUMN_FORMAT_MASK); Lex->type|= @@ -24698,7 +24703,7 @@ case 767: /* Line 1792 of yacc.c */ -#line 6780 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6785 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK); Lex->type|= (HA_SM_DEFAULT << FIELD_FLAGS_STORAGE_MEDIA); @@ -24707,7 +24712,7 @@ case 768: /* Line 1792 of yacc.c */ -#line 6785 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6790 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK); Lex->type|= (HA_SM_DISK << FIELD_FLAGS_STORAGE_MEDIA); @@ -24716,7 +24721,7 @@ case 769: /* Line 1792 of yacc.c */ -#line 6790 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6795 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type&= ~(FIELD_FLAGS_STORAGE_MEDIA_MASK); Lex->type|= (HA_SM_MEMORY << FIELD_FLAGS_STORAGE_MEDIA); @@ -24725,7 +24730,7 @@ case 770: /* Line 1792 of yacc.c */ -#line 6799 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6804 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (2)].num); @@ -24746,7 +24751,7 @@ case 771: /* Line 1792 of yacc.c */ -#line 6820 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6825 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_now_local((yyvsp[(2) - (2)].ulong_num)); if ((yyval.item) == NULL) @@ -24756,25 +24761,25 @@ case 773: /* Line 1792 of yacc.c */ -#line 6829 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6834 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=(yyvsp[(1) - (1)].item); } break; case 774: /* Line 1792 of yacc.c */ -#line 6833 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6838 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 775: /* Line 1792 of yacc.c */ -#line 6834 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6839 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 776: /* Line 1792 of yacc.c */ -#line 6839 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6844 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0)))) { @@ -24786,37 +24791,37 @@ case 777: /* Line 1792 of yacc.c */ -#line 6846 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6851 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)= &my_charset_bin; } break; case 778: /* Line 1792 of yacc.c */ -#line 6850 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6855 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=(yyvsp[(1) - (1)].charset); } break; case 779: /* Line 1792 of yacc.c */ -#line 6851 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6856 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=NULL; } break; case 780: /* Line 1792 of yacc.c */ -#line 6855 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6860 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)= NULL; } break; case 781: /* Line 1792 of yacc.c */ -#line 6856 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6861 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)= (yyvsp[(2) - (2)].charset); } break; case 782: /* Line 1792 of yacc.c */ -#line 6861 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6866 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))) && !((yyval.charset)=get_old_charset_by_name((yyvsp[(1) - (1)].lex_str).str))) @@ -24829,25 +24834,25 @@ case 783: /* Line 1792 of yacc.c */ -#line 6869 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6874 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)= &my_charset_bin; } break; case 784: /* Line 1792 of yacc.c */ -#line 6873 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6878 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=(yyvsp[(1) - (1)].charset); } break; case 785: /* Line 1792 of yacc.c */ -#line 6874 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6879 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=NULL; } break; case 786: /* Line 1792 of yacc.c */ -#line 6879 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6884 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.charset)= mysqld_collation_get_by_name((yyvsp[(1) - (1)].lex_str).str))) MYSQL_YYABORT; @@ -24856,49 +24861,49 @@ case 787: /* Line 1792 of yacc.c */ -#line 6886 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6891 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=NULL; } break; case 788: /* Line 1792 of yacc.c */ -#line 6887 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6892 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=(yyvsp[(2) - (2)].charset); } break; case 789: /* Line 1792 of yacc.c */ -#line 6891 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6896 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=(yyvsp[(1) - (1)].charset); } break; case 790: /* Line 1792 of yacc.c */ -#line 6892 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6897 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.charset)=NULL; } break; case 791: /* Line 1792 of yacc.c */ -#line 6896 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6901 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 792: /* Line 1792 of yacc.c */ -#line 6897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 793: /* Line 1792 of yacc.c */ -#line 6902 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6907 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset= &my_charset_latin1; } break; case 794: /* Line 1792 of yacc.c */ -#line 6904 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6909 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset= &my_charset_latin1_bin; } @@ -24906,7 +24911,7 @@ case 795: /* Line 1792 of yacc.c */ -#line 6908 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6913 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset= &my_charset_latin1_bin; } @@ -24914,7 +24919,7 @@ case 796: /* Line 1792 of yacc.c */ -#line 6915 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6920 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(Lex->charset=get_charset_by_csname("ucs2", MY_CS_PRIMARY,MYF(0)))) @@ -24927,7 +24932,7 @@ case 797: /* Line 1792 of yacc.c */ -#line 6924 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6929 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(Lex->charset= mysqld_collation_get_by_name("ucs2_bin"))) MYSQL_YYABORT; @@ -24936,7 +24941,7 @@ case 798: /* Line 1792 of yacc.c */ -#line 6929 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6934 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(Lex->charset= mysqld_collation_get_by_name("ucs2_bin"))) my_error(ER_UNKNOWN_COLLATION, MYF(0), "ucs2_bin"); @@ -24945,25 +24950,25 @@ case 799: /* Line 1792 of yacc.c */ -#line 6936 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6941 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=NULL; } break; case 802: /* Line 1792 of yacc.c */ -#line 6939 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6944 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=&my_charset_bin; } break; case 803: /* Line 1792 of yacc.c */ -#line 6940 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6945 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset=(yyvsp[(2) - (3)].charset); } break; case 804: /* Line 1792 of yacc.c */ -#line 6942 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6947 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset= NULL; Lex->type|= BINCMP_FLAG; @@ -24972,7 +24977,7 @@ case 805: /* Line 1792 of yacc.c */ -#line 6947 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6952 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->charset= (yyvsp[(3) - (3)].charset); Lex->type|= BINCMP_FLAG; @@ -24981,19 +24986,19 @@ case 806: /* Line 1792 of yacc.c */ -#line 6954 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6959 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 807: /* Line 1792 of yacc.c */ -#line 6955 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6960 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= BINCMP_FLAG; } break; case 808: /* Line 1792 of yacc.c */ -#line 6960 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6965 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(2) - (2)].ulong_num) == 0) { @@ -25005,55 +25010,55 @@ case 809: /* Line 1792 of yacc.c */ -#line 6968 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6973 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(2) - (4)].ulong_num); } break; case 810: /* Line 1792 of yacc.c */ -#line 6972 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6977 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 0; } break; case 811: /* Line 1792 of yacc.c */ -#line 6973 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6978 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 1 << MY_STRXFRM_DESC_SHIFT; } break; case 812: /* Line 1792 of yacc.c */ -#line 6977 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6982 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 1 << MY_STRXFRM_REVERSE_SHIFT; } break; case 813: /* Line 1792 of yacc.c */ -#line 6980 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6985 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 0; } break; case 814: /* Line 1792 of yacc.c */ -#line 6981 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6986 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); } break; case 815: /* Line 1792 of yacc.c */ -#line 6982 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6987 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (2)].ulong_num) | (yyvsp[(2) - (2)].ulong_num); } break; case 816: /* Line 1792 of yacc.c */ -#line 6983 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6988 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num) ; } break; case 817: /* Line 1792 of yacc.c */ -#line 6988 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 6993 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num) < 1 ? 1 : ((yyvsp[(1) - (1)].ulong_num) > MY_STRXFRM_NLEVELS ? MY_STRXFRM_NLEVELS : (yyvsp[(1) - (1)].ulong_num)); (yyval.ulong_num)--; @@ -25062,7 +25067,7 @@ case 818: /* Line 1792 of yacc.c */ -#line 6996 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7001 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (1 | (yyvsp[(2) - (2)].ulong_num)) << (yyvsp[(1) - (2)].ulong_num); } @@ -25070,19 +25075,19 @@ case 819: /* Line 1792 of yacc.c */ -#line 7002 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7007 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); } break; case 820: /* Line 1792 of yacc.c */ -#line 7003 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7008 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)|= (yyvsp[(3) - (3)].ulong_num); } break; case 821: /* Line 1792 of yacc.c */ -#line 7008 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7013 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { uint start= (yyvsp[(1) - (3)].ulong_num); uint end= (yyvsp[(3) - (3)].ulong_num); @@ -25093,31 +25098,31 @@ case 822: /* Line 1792 of yacc.c */ -#line 7017 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7022 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); } break; case 823: /* Line 1792 of yacc.c */ -#line 7018 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7023 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(1) - (1)].ulong_num); } break; case 824: /* Line 1792 of yacc.c */ -#line 7022 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7027 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= 0; } break; case 825: /* Line 1792 of yacc.c */ -#line 7023 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7028 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (yyvsp[(2) - (2)].ulong_num); } break; case 828: /* Line 1792 of yacc.c */ -#line 7037 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7042 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table)=(yyvsp[(2) - (5)].table); } @@ -25125,13 +25130,13 @@ case 829: /* Line 1792 of yacc.c */ -#line 7044 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7049 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ref_list.empty(); } break; case 831: /* Line 1792 of yacc.c */ -#line 7050 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7055 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Key_part_spec *key= new Key_part_spec((yyvsp[(3) - (3)].lex_str), 0); if (key == NULL) @@ -25142,7 +25147,7 @@ case 832: /* Line 1792 of yacc.c */ -#line 7057 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7062 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Key_part_spec *key= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0); if (key == NULL) @@ -25155,31 +25160,31 @@ case 833: /* Line 1792 of yacc.c */ -#line 7069 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7074 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->fk_match_option= Foreign_key::FK_MATCH_UNDEF; } break; case 834: /* Line 1792 of yacc.c */ -#line 7071 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7076 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->fk_match_option= Foreign_key::FK_MATCH_FULL; } break; case 835: /* Line 1792 of yacc.c */ -#line 7073 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7078 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->fk_match_option= Foreign_key::FK_MATCH_PARTIAL; } break; case 836: /* Line 1792 of yacc.c */ -#line 7075 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7080 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->fk_match_option= Foreign_key::FK_MATCH_SIMPLE; } break; case 837: /* Line 1792 of yacc.c */ -#line 7080 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7085 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF; @@ -25189,7 +25194,7 @@ case 838: /* Line 1792 of yacc.c */ -#line 7086 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7091 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->fk_update_opt= (yyvsp[(3) - (3)].m_fk_option); @@ -25199,7 +25204,7 @@ case 839: /* Line 1792 of yacc.c */ -#line 7092 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7097 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF; @@ -25209,7 +25214,7 @@ case 840: /* Line 1792 of yacc.c */ -#line 7099 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7104 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->fk_update_opt= (yyvsp[(3) - (6)].m_fk_option); @@ -25219,7 +25224,7 @@ case 841: /* Line 1792 of yacc.c */ -#line 7106 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7111 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->fk_update_opt= (yyvsp[(6) - (6)].m_fk_option); @@ -25229,109 +25234,109 @@ case 842: /* Line 1792 of yacc.c */ -#line 7114 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7119 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_fk_option)= Foreign_key::FK_OPTION_RESTRICT; } break; case 843: /* Line 1792 of yacc.c */ -#line 7115 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7120 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_fk_option)= Foreign_key::FK_OPTION_CASCADE; } break; case 844: /* Line 1792 of yacc.c */ -#line 7116 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7121 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_fk_option)= Foreign_key::FK_OPTION_SET_NULL; } break; case 845: /* Line 1792 of yacc.c */ -#line 7117 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7122 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_fk_option)= Foreign_key::FK_OPTION_NO_ACTION; } break; case 846: /* Line 1792 of yacc.c */ -#line 7118 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7123 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_fk_option)= Foreign_key::FK_OPTION_DEFAULT; } break; case 847: /* Line 1792 of yacc.c */ -#line 7122 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7127 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::MULTIPLE; } break; case 848: /* Line 1792 of yacc.c */ -#line 7126 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7131 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::PRIMARY; } break; case 849: /* Line 1792 of yacc.c */ -#line 7127 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7132 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::UNIQUE; } break; case 850: /* Line 1792 of yacc.c */ -#line 7131 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7136 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 851: /* Line 1792 of yacc.c */ -#line 7132 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7137 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 852: /* Line 1792 of yacc.c */ -#line 7136 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7141 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 854: /* Line 1792 of yacc.c */ -#line 7141 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7146 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 855: /* Line 1792 of yacc.c */ -#line 7142 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7147 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 856: /* Line 1792 of yacc.c */ -#line 7143 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7148 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 857: /* Line 1792 of yacc.c */ -#line 7147 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7152 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::MULTIPLE; } break; case 858: /* Line 1792 of yacc.c */ -#line 7148 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7153 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::UNIQUE; } break; case 859: /* Line 1792 of yacc.c */ -#line 7152 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7157 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_type)= Key::FULLTEXT;} break; case 860: /* Line 1792 of yacc.c */ -#line 7157 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7162 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_SPATIAL (yyval.key_type)= Key::SPATIAL; @@ -25345,7 +25350,7 @@ case 861: /* Line 1792 of yacc.c */ -#line 7169 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7174 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->key_create_info= default_key_create_info; } @@ -25353,49 +25358,49 @@ case 864: /* Line 1792 of yacc.c */ -#line 7186 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7191 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 866: /* Line 1792 of yacc.c */ -#line 7191 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7196 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 868: /* Line 1792 of yacc.c */ -#line 7196 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7201 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 876: /* Line 1792 of yacc.c */ -#line 7216 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); } break; case 877: /* Line 1792 of yacc.c */ -#line 7217 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7222 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); } break; case 878: /* Line 1792 of yacc.c */ -#line 7222 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7227 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->key_create_info.block_size= (yyvsp[(3) - (3)].ulong_num); } break; case 879: /* Line 1792 of yacc.c */ -#line 7223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->key_create_info.comment= (yyvsp[(2) - (2)].lex_str); } break; case 884: /* Line 1792 of yacc.c */ -#line 7238 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7243 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (plugin_is_ready(&(yyvsp[(3) - (3)].lex_str), MYSQL_FTPARSER_PLUGIN)) Lex->key_create_info.parser_name= (yyvsp[(3) - (3)].lex_str); @@ -25409,37 +25414,37 @@ case 885: /* Line 1792 of yacc.c */ -#line 7250 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7255 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_alg)= HA_KEY_ALG_BTREE; } break; case 886: /* Line 1792 of yacc.c */ -#line 7251 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7256 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_alg)= HA_KEY_ALG_RTREE; } break; case 887: /* Line 1792 of yacc.c */ -#line 7252 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7257 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_alg)= HA_KEY_ALG_HASH; } break; case 888: /* Line 1792 of yacc.c */ -#line 7256 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7261 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->col_list.push_back((yyvsp[(3) - (4)].key_part)); } break; case 889: /* Line 1792 of yacc.c */ -#line 7257 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7262 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->col_list.push_back((yyvsp[(1) - (2)].key_part)); } break; case 890: /* Line 1792 of yacc.c */ -#line 7262 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7267 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.key_part)= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0); if ((yyval.key_part) == NULL) @@ -25449,7 +25454,7 @@ case 891: /* Line 1792 of yacc.c */ -#line 7268 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7273 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int key_part_len= atoi((yyvsp[(3) - (4)].lex_str).str); if (!key_part_len) @@ -25464,43 +25469,43 @@ case 892: /* Line 1792 of yacc.c */ -#line 7281 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7286 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= null_lex_str; } break; case 893: /* Line 1792 of yacc.c */ -#line 7282 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7287 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 894: /* Line 1792 of yacc.c */ -#line 7286 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7291 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= null_lex_str; } break; case 895: /* Line 1792 of yacc.c */ -#line 7287 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7292 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(2) - (2)].lex_str); } break; case 896: /* Line 1792 of yacc.c */ -#line 7291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7296 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->interval_list.push_back((yyvsp[(1) - (1)].string)); } break; case 897: /* Line 1792 of yacc.c */ -#line 7292 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7297 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->interval_list.push_back((yyvsp[(3) - (3)].string)); } break; case 898: /* Line 1792 of yacc.c */ -#line 7300 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7305 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25537,7 +25542,7 @@ case 899: /* Line 1792 of yacc.c */ -#line 7333 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7338 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25553,7 +25558,7 @@ case 900: /* Line 1792 of yacc.c */ -#line 7345 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7350 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.default_table_charset= NULL; Lex->create_info.used_fields= 0; @@ -25562,7 +25567,7 @@ case 901: /* Line 1792 of yacc.c */ -#line 7350 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7355 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command=SQLCOM_ALTER_DB; @@ -25575,7 +25580,7 @@ case 902: /* Line 1792 of yacc.c */ -#line 7359 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7364 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->sphead) @@ -25590,7 +25595,7 @@ case 903: /* Line 1792 of yacc.c */ -#line 7370 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7375 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -25605,7 +25610,7 @@ case 904: /* Line 1792 of yacc.c */ -#line 7381 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7386 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; @@ -25616,7 +25621,7 @@ case 905: /* Line 1792 of yacc.c */ -#line 7388 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7393 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -25631,7 +25636,7 @@ case 906: /* Line 1792 of yacc.c */ -#line 7399 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7404 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; @@ -25642,7 +25647,7 @@ case 907: /* Line 1792 of yacc.c */ -#line 7406 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7411 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -25657,13 +25662,13 @@ case 908: /* Line 1792 of yacc.c */ -#line 7417 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7422 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 909: /* Line 1792 of yacc.c */ -#line 7424 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7429 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -25679,13 +25684,13 @@ case 910: /* Line 1792 of yacc.c */ -#line 7436 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7441 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 911: /* Line 1792 of yacc.c */ -#line 7438 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7443 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* It is safe to use Lex->spname because @@ -25705,7 +25710,7 @@ case 912: /* Line 1792 of yacc.c */ -#line 7458 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7463 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyvsp[(6) - (10)].num) || (yyvsp[(7) - (10)].num) || (yyvsp[(8) - (10)].num) || (yyvsp[(9) - (10)].num) || (yyvsp[(10) - (10)].num))) { @@ -25722,7 +25727,7 @@ case 913: /* Line 1792 of yacc.c */ -#line 7471 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7476 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE; @@ -25731,7 +25736,7 @@ case 914: /* Line 1792 of yacc.c */ -#line 7476 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7481 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP; @@ -25740,7 +25745,7 @@ case 915: /* Line 1792 of yacc.c */ -#line 7481 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7486 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE; @@ -25749,7 +25754,7 @@ case 916: /* Line 1792 of yacc.c */ -#line 7486 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7491 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE; @@ -25758,7 +25763,7 @@ case 917: /* Line 1792 of yacc.c */ -#line 7491 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7496 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_ALTER_SERVER; @@ -25769,7 +25774,7 @@ case 918: /* Line 1792 of yacc.c */ -#line 7498 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7503 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_ALTER_USER; } @@ -25777,7 +25782,7 @@ case 919: /* Line 1792 of yacc.c */ -#line 7505 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7510 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user))) MYSQL_YYABORT; @@ -25786,7 +25791,7 @@ case 920: /* Line 1792 of yacc.c */ -#line 7510 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7515 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user))) MYSQL_YYABORT; @@ -25795,37 +25800,37 @@ case 921: /* Line 1792 of yacc.c */ -#line 7517 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7522 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0;} break; case 922: /* Line 1792 of yacc.c */ -#line 7518 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7523 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 923: /* Line 1792 of yacc.c */ -#line 7519 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7524 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 924: /* Line 1792 of yacc.c */ -#line 7520 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7525 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 925: /* Line 1792 of yacc.c */ -#line 7524 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7529 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0;} break; case 926: /* Line 1792 of yacc.c */ -#line 7526 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7531 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Use lex's spname to hold the new name. @@ -25838,31 +25843,31 @@ case 927: /* Line 1792 of yacc.c */ -#line 7537 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7542 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0;} break; case 928: /* Line 1792 of yacc.c */ -#line 7538 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7543 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 929: /* Line 1792 of yacc.c */ -#line 7542 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7547 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str).str= 0; (yyval.lex_str).length= 0; } break; case 930: /* Line 1792 of yacc.c */ -#line 7543 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7548 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 932: /* Line 1792 of yacc.c */ -#line 7549 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7554 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->m_sql_cmd= new (YYTHD->mem_root) Sql_cmd_discard_import_tablespace( @@ -25874,7 +25879,7 @@ case 933: /* Line 1792 of yacc.c */ -#line 7557 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7562 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->m_sql_cmd= new (YYTHD->mem_root) Sql_cmd_discard_import_tablespace( @@ -25886,7 +25891,7 @@ case 939: /* Line 1792 of yacc.c */ -#line 7579 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7584 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_DROP_PARTITION; } @@ -25894,7 +25899,7 @@ case 940: /* Line 1792 of yacc.c */ -#line 7584 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7589 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_info.flags|= Alter_info::ALTER_REBUILD_PARTITION; @@ -25904,7 +25909,7 @@ case 941: /* Line 1792 of yacc.c */ -#line 7591 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7596 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25920,7 +25925,7 @@ case 943: /* Line 1792 of yacc.c */ -#line 7605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25936,7 +25941,7 @@ case 944: /* Line 1792 of yacc.c */ -#line 7617 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7622 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25951,7 +25956,7 @@ case 946: /* Line 1792 of yacc.c */ -#line 7630 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7635 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25967,7 +25972,7 @@ case 948: /* Line 1792 of yacc.c */ -#line 7643 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7648 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_info.flags|= Alter_info::ALTER_COALESCE_PARTITION; @@ -25978,7 +25983,7 @@ case 949: /* Line 1792 of yacc.c */ -#line 7650 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7655 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -25993,7 +25998,7 @@ case 951: /* Line 1792 of yacc.c */ -#line 7663 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7668 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -26021,7 +26026,7 @@ case 952: /* Line 1792 of yacc.c */ -#line 7690 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7695 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_REMOVE_PARTITIONING; } @@ -26029,7 +26034,7 @@ case 953: /* Line 1792 of yacc.c */ -#line 7697 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7702 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_ALL_PARTITION; } @@ -26037,7 +26042,7 @@ case 955: /* Line 1792 of yacc.c */ -#line 7705 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7710 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->part_info= new partition_info(); @@ -26053,13 +26058,13 @@ case 956: /* Line 1792 of yacc.c */ -#line 7717 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7722 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 958: /* Line 1792 of yacc.c */ -#line 7723 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7728 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->part_info->num_parts= lex->part_info->partitions.elements; @@ -26068,7 +26073,7 @@ case 959: /* Line 1792 of yacc.c */ -#line 7728 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7733 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->part_info->num_parts= (yyvsp[(2) - (2)].ulong_num); } @@ -26076,7 +26081,7 @@ case 960: /* Line 1792 of yacc.c */ -#line 7735 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7740 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->part_info= new partition_info(); @@ -26091,7 +26096,7 @@ case 962: /* Line 1792 of yacc.c */ -#line 7750 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7755 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_TABLE_REORG; } @@ -26099,7 +26104,7 @@ case 963: /* Line 1792 of yacc.c */ -#line 7754 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7759 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_REORGANIZE_PARTITION; } @@ -26107,7 +26112,7 @@ case 964: /* Line 1792 of yacc.c */ -#line 7758 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7763 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { partition_info *part_info= Lex->part_info; part_info->num_parts= part_info->partitions.elements; @@ -26116,19 +26121,19 @@ case 965: /* Line 1792 of yacc.c */ -#line 7765 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7770 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 966: /* Line 1792 of yacc.c */ -#line 7766 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7771 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 967: /* Line 1792 of yacc.c */ -#line 7771 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7776 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->alter_info.partition_names.push_back((yyvsp[(1) - (1)].lex_str).str)) { @@ -26140,7 +26145,7 @@ case 970: /* Line 1792 of yacc.c */ -#line 7791 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7796 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->change=0; @@ -26150,7 +26155,7 @@ case 971: /* Line 1792 of yacc.c */ -#line 7800 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7805 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_last_non_select_table= Lex->last_table(); } @@ -26158,7 +26163,7 @@ case 972: /* Line 1792 of yacc.c */ -#line 7804 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7809 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_last_non_select_table= Lex->last_table(); Lex->alter_info.flags|= Alter_info::ALTER_ADD_INDEX; @@ -26167,7 +26172,7 @@ case 973: /* Line 1792 of yacc.c */ -#line 7809 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7814 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_ADD_COLUMN | Alter_info::ALTER_ADD_INDEX; @@ -26176,7 +26181,7 @@ case 974: /* Line 1792 of yacc.c */ -#line 7814 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7819 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->change= (yyvsp[(3) - (3)].lex_str).str; @@ -26186,7 +26191,7 @@ case 975: /* Line 1792 of yacc.c */ -#line 7820 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7825 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_last_non_select_table= Lex->last_table(); } @@ -26194,7 +26199,7 @@ case 976: /* Line 1792 of yacc.c */ -#line 7824 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7829 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->length=lex->dec=0; lex->type=0; @@ -26207,7 +26212,7 @@ case 977: /* Line 1792 of yacc.c */ -#line 7833 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7838 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (add_field_to_list(lex->thd,&(yyvsp[(3) - (6)].lex_str), @@ -26223,7 +26228,7 @@ case 978: /* Line 1792 of yacc.c */ -#line 7845 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7850 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_last_non_select_table= Lex->last_table(); } @@ -26231,7 +26236,7 @@ case 979: /* Line 1792 of yacc.c */ -#line 7849 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7854 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, (yyvsp[(3) - (4)].lex_str).str); @@ -26244,7 +26249,7 @@ case 980: /* Line 1792 of yacc.c */ -#line 7858 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7863 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_drop *ad= new Alter_drop(Alter_drop::FOREIGN_KEY, (yyvsp[(4) - (4)].lex_str).str); @@ -26257,7 +26262,7 @@ case 981: /* Line 1792 of yacc.c */ -#line 7867 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7872 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name); @@ -26270,7 +26275,7 @@ case 982: /* Line 1792 of yacc.c */ -#line 7876 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7881 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (3)].lex_str).str); @@ -26283,7 +26288,7 @@ case 983: /* Line 1792 of yacc.c */ -#line 7885 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7890 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->alter_info.keys_onoff= Alter_info::DISABLE; @@ -26293,7 +26298,7 @@ case 984: /* Line 1792 of yacc.c */ -#line 7891 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7896 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->alter_info.keys_onoff= Alter_info::ENABLE; @@ -26303,7 +26308,7 @@ case 985: /* Line 1792 of yacc.c */ -#line 7897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_column *ac= new Alter_column((yyvsp[(3) - (6)].lex_str).str,(yyvsp[(6) - (6)].item)); @@ -26316,7 +26321,7 @@ case 986: /* Line 1792 of yacc.c */ -#line 7906 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7911 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_column *ac= new Alter_column((yyvsp[(3) - (5)].lex_str).str, (Item*) 0); @@ -26329,7 +26334,7 @@ case 987: /* Line 1792 of yacc.c */ -#line 7915 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7920 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; size_t dummy; @@ -26361,7 +26366,7 @@ case 988: /* Line 1792 of yacc.c */ -#line 7943 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7948 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(yyvsp[(4) - (5)].charset)) { @@ -26386,7 +26391,7 @@ case 989: /* Line 1792 of yacc.c */ -#line 7964 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7969 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->alter_info.flags|= Alter_info::ALTER_OPTIONS; @@ -26400,7 +26405,7 @@ case 990: /* Line 1792 of yacc.c */ -#line 7974 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7979 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_RECREATE; } @@ -26408,7 +26413,7 @@ case 991: /* Line 1792 of yacc.c */ -#line 7978 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 7983 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->alter_info.flags|= Alter_info::ALTER_ORDER; @@ -26417,7 +26422,7 @@ case 999: /* Line 1792 of yacc.c */ -#line 7995 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8000 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.requested_algorithm= Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT; @@ -26426,7 +26431,7 @@ case 1000: /* Line 1792 of yacc.c */ -#line 8000 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8005 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->alter_info.set_requested_algorithm(&(yyvsp[(3) - (3)].lex_str))) { @@ -26438,7 +26443,7 @@ case 1001: /* Line 1792 of yacc.c */ -#line 8011 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8016 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.requested_lock= Alter_info::ALTER_TABLE_LOCK_DEFAULT; @@ -26447,7 +26452,7 @@ case 1002: /* Line 1792 of yacc.c */ -#line 8016 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8021 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->alter_info.set_requested_lock(&(yyvsp[(3) - (3)].lex_str))) { @@ -26459,55 +26464,55 @@ case 1003: /* Line 1792 of yacc.c */ -#line 8026 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8031 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1004: /* Line 1792 of yacc.c */ -#line 8027 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8032 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1005: /* Line 1792 of yacc.c */ -#line 8031 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8036 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ignore= 0;} break; case 1006: /* Line 1792 of yacc.c */ -#line 8032 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8037 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ignore= 1;} break; case 1007: /* Line 1792 of yacc.c */ -#line 8036 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8041 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->drop_mode= DROP_DEFAULT; } break; case 1008: /* Line 1792 of yacc.c */ -#line 8037 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8042 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->drop_mode= DROP_RESTRICT; } break; case 1009: /* Line 1792 of yacc.c */ -#line 8038 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8043 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->drop_mode= DROP_CASCADE; } break; case 1010: /* Line 1792 of yacc.c */ -#line 8042 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8047 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1011: /* Line 1792 of yacc.c */ -#line 8044 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8049 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { store_position_for_column((yyvsp[(2) - (2)].lex_str).str); Lex->alter_info.flags |= Alter_info::ALTER_COLUMN_ORDER; @@ -26516,7 +26521,7 @@ case 1012: /* Line 1792 of yacc.c */ -#line 8049 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8054 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { store_position_for_column(first_keyword); Lex->alter_info.flags |= Alter_info::ALTER_COLUMN_ORDER; @@ -26525,31 +26530,31 @@ case 1013: /* Line 1792 of yacc.c */ -#line 8056 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8061 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1014: /* Line 1792 of yacc.c */ -#line 8057 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8062 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1015: /* Line 1792 of yacc.c */ -#line 8058 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8063 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1016: /* Line 1792 of yacc.c */ -#line 8059 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8064 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1017: /* Line 1792 of yacc.c */ -#line 8064 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8069 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; /* Clean previous slave connection values */ @@ -26564,7 +26569,7 @@ case 1018: /* Line 1792 of yacc.c */ -#line 8076 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8081 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* It is not possible to set user's information when @@ -26585,7 +26590,7 @@ case 1019: /* Line 1792 of yacc.c */ -#line 8093 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8098 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_SLAVE_STOP; @@ -26596,7 +26601,7 @@ case 1020: /* Line 1792 of yacc.c */ -#line 8103 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8108 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_BEGIN; @@ -26613,7 +26618,7 @@ case 1021: /* Line 1792 of yacc.c */ -#line 8119 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8124 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } @@ -26621,7 +26626,7 @@ case 1022: /* Line 1792 of yacc.c */ -#line 8123 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8128 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (1)].num); } @@ -26629,7 +26634,7 @@ case 1023: /* Line 1792 of yacc.c */ -#line 8130 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8135 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (1)].num); } @@ -26637,7 +26642,7 @@ case 1024: /* Line 1792 of yacc.c */ -#line 8134 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8139 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (3)].num) | (yyvsp[(3) - (3)].num); } @@ -26645,7 +26650,7 @@ case 1025: /* Line 1792 of yacc.c */ -#line 8141 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8146 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT; } @@ -26653,7 +26658,7 @@ case 1026: /* Line 1792 of yacc.c */ -#line 8145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_START_TRANS_OPT_READ_ONLY; } @@ -26661,7 +26666,7 @@ case 1027: /* Line 1792 of yacc.c */ -#line 8149 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8154 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= MYSQL_START_TRANS_OPT_READ_WRITE; } @@ -26669,7 +26674,7 @@ case 1029: /* Line 1792 of yacc.c */ -#line 8160 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8165 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* empty */ } @@ -26677,7 +26682,7 @@ case 1030: /* Line 1792 of yacc.c */ -#line 8164 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8169 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->slave_connection.user= (yyvsp[(3) - (3)].lex_str).str; } @@ -26685,7 +26690,7 @@ case 1031: /* Line 1792 of yacc.c */ -#line 8170 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* empty */ } @@ -26693,7 +26698,7 @@ case 1032: /* Line 1792 of yacc.c */ -#line 8174 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8179 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->slave_connection.password= (yyvsp[(3) - (3)].lex_str).str; Lex->contains_plaintext_password= true; @@ -26702,7 +26707,7 @@ case 1033: /* Line 1792 of yacc.c */ -#line 8180 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8185 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* empty */ } @@ -26710,7 +26715,7 @@ case 1034: /* Line 1792 of yacc.c */ -#line 8184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->slave_connection.plugin_auth= (yyvsp[(3) - (3)].lex_str).str; } @@ -26718,7 +26723,7 @@ case 1035: /* Line 1792 of yacc.c */ -#line 8190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* empty */ } @@ -26726,7 +26731,7 @@ case 1036: /* Line 1792 of yacc.c */ -#line 8194 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8199 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->slave_connection.plugin_dir= (yyvsp[(3) - (3)].lex_str).str; } @@ -26734,7 +26739,7 @@ case 1037: /* Line 1792 of yacc.c */ -#line 8201 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8206 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } @@ -26742,7 +26747,7 @@ case 1038: /* Line 1792 of yacc.c */ -#line 8205 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8210 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (1)].num); } @@ -26750,7 +26755,7 @@ case 1039: /* Line 1792 of yacc.c */ -#line 8212 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8217 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (1)].num); } @@ -26758,7 +26763,7 @@ case 1040: /* Line 1792 of yacc.c */ -#line 8216 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (3)].num) | (yyvsp[(3) - (3)].num); } @@ -26766,7 +26771,7 @@ case 1041: /* Line 1792 of yacc.c */ -#line 8223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= SLAVE_SQL; } @@ -26774,7 +26779,7 @@ case 1042: /* Line 1792 of yacc.c */ -#line 8227 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8232 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= SLAVE_IO; } @@ -26782,13 +26787,13 @@ case 1043: /* Line 1792 of yacc.c */ -#line 8233 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8238 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1044: /* Line 1792 of yacc.c */ -#line 8235 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8240 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (((lex->mi.log_file_name || lex->mi.pos) && @@ -26814,7 +26819,7 @@ case 1047: /* Line 1792 of yacc.c */ -#line 8262 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8267 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.gtid= (yyvsp[(3) - (3)].lex_str).str; Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_BEFORE_GTIDS; @@ -26823,7 +26828,7 @@ case 1048: /* Line 1792 of yacc.c */ -#line 8267 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8272 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.gtid= (yyvsp[(3) - (3)].lex_str).str; Lex->mi.gtid_until_condition= LEX_MASTER_INFO::UNTIL_SQL_AFTER_GTIDS; @@ -26832,7 +26837,7 @@ case 1049: /* Line 1792 of yacc.c */ -#line 8272 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.until_after_gaps= true; } @@ -26840,7 +26845,7 @@ case 1050: /* Line 1792 of yacc.c */ -#line 8279 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8284 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_CHECKSUM; @@ -26851,31 +26856,31 @@ case 1051: /* Line 1792 of yacc.c */ -#line 8286 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8291 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1052: /* Line 1792 of yacc.c */ -#line 8290 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8295 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags= 0; } break; case 1053: /* Line 1792 of yacc.c */ -#line 8291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8296 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags= T_QUICK; } break; case 1054: /* Line 1792 of yacc.c */ -#line 8292 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8297 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags= T_EXTEND; } break; case 1055: /* Line 1792 of yacc.c */ -#line 8297 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8302 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_REPAIR; @@ -26889,7 +26894,7 @@ case 1056: /* Line 1792 of yacc.c */ -#line 8307 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8312 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX* lex= thd->lex; @@ -26902,49 +26907,49 @@ case 1057: /* Line 1792 of yacc.c */ -#line 8318 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8323 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags = T_MEDIUM; } break; case 1058: /* Line 1792 of yacc.c */ -#line 8319 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8324 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1059: /* Line 1792 of yacc.c */ -#line 8323 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8328 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1060: /* Line 1792 of yacc.c */ -#line 8324 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8329 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1061: /* Line 1792 of yacc.c */ -#line 8328 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8333 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_QUICK; } break; case 1062: /* Line 1792 of yacc.c */ -#line 8329 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8334 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_EXTEND; } break; case 1063: /* Line 1792 of yacc.c */ -#line 8330 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8335 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.sql_flags|= TT_USEFRM; } break; case 1064: /* Line 1792 of yacc.c */ -#line 8335 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8340 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_ANALYZE; @@ -26958,7 +26963,7 @@ case 1065: /* Line 1792 of yacc.c */ -#line 8345 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8350 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX* lex= thd->lex; @@ -26971,7 +26976,7 @@ case 1066: /* Line 1792 of yacc.c */ -#line 8357 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8362 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT; Lex->comment= (yyvsp[(2) - (2)].lex_str); @@ -26980,7 +26985,7 @@ case 1067: /* Line 1792 of yacc.c */ -#line 8365 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8370 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; @@ -26999,7 +27004,7 @@ case 1068: /* Line 1792 of yacc.c */ -#line 8380 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8385 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX* lex= thd->lex; @@ -27012,67 +27017,67 @@ case 1069: /* Line 1792 of yacc.c */ -#line 8391 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8396 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags = T_MEDIUM; } break; case 1070: /* Line 1792 of yacc.c */ -#line 8392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1071: /* Line 1792 of yacc.c */ -#line 8396 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8401 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1072: /* Line 1792 of yacc.c */ -#line 8397 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8402 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1073: /* Line 1792 of yacc.c */ -#line 8401 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8406 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_QUICK; } break; case 1074: /* Line 1792 of yacc.c */ -#line 8402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_FAST; } break; case 1075: /* Line 1792 of yacc.c */ -#line 8403 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8408 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_MEDIUM; } break; case 1076: /* Line 1792 of yacc.c */ -#line 8404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_EXTEND; } break; case 1077: /* Line 1792 of yacc.c */ -#line 8405 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8410 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; } break; case 1078: /* Line 1792 of yacc.c */ -#line 8406 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8411 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; } break; case 1079: /* Line 1792 of yacc.c */ -#line 8411 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8416 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_OPTIMIZE; @@ -27086,7 +27091,7 @@ case 1080: /* Line 1792 of yacc.c */ -#line 8421 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8426 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX* lex= thd->lex; @@ -27099,25 +27104,25 @@ case 1081: /* Line 1792 of yacc.c */ -#line 8432 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8437 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 1082: /* Line 1792 of yacc.c */ -#line 8433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 1083: /* Line 1792 of yacc.c */ -#line 8434 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8439 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 1084: /* Line 1792 of yacc.c */ -#line 8439 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8444 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_RENAME_TABLE; } @@ -27125,13 +27130,13 @@ case 1085: /* Line 1792 of yacc.c */ -#line 8443 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8448 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1086: /* Line 1792 of yacc.c */ -#line 8445 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8450 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_RENAME_USER; } @@ -27139,7 +27144,7 @@ case 1087: /* Line 1792 of yacc.c */ -#line 8452 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8457 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)) || Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user))) MYSQL_YYABORT; @@ -27148,7 +27153,7 @@ case 1088: /* Line 1792 of yacc.c */ -#line 8457 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8462 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)) || Lex->users_list.push_back((yyvsp[(5) - (5)].lex_user))) MYSQL_YYABORT; @@ -27157,7 +27162,7 @@ case 1091: /* Line 1792 of yacc.c */ -#line 8470 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8475 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; SELECT_LEX *sl= lex->current_select; @@ -27171,7 +27176,7 @@ case 1092: /* Line 1792 of yacc.c */ -#line 8483 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8488 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.reset(); } @@ -27179,7 +27184,7 @@ case 1093: /* Line 1792 of yacc.c */ -#line 8487 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8492 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE; @@ -27189,7 +27194,7 @@ case 1098: /* Line 1792 of yacc.c */ -#line 8506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL, 0, TL_READ, MDL_SHARED_READ, @@ -27200,7 +27205,7 @@ case 1099: /* Line 1792 of yacc.c */ -#line 8516 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8521 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, 0, TL_READ, MDL_SHARED_READ, @@ -27211,19 +27216,19 @@ case 1100: /* Line 1792 of yacc.c */ -#line 8525 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8530 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 1101: /* Line 1792 of yacc.c */ -#line 8526 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8531 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str) = default_key_cache_base; } break; case 1102: /* Line 1792 of yacc.c */ -#line 8531 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8536 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command=SQLCOM_PRELOAD_KEYS; @@ -27233,13 +27238,13 @@ case 1103: /* Line 1792 of yacc.c */ -#line 8537 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8542 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1108: /* Line 1792 of yacc.c */ -#line 8552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, (yyvsp[(3) - (3)].num), TL_READ, MDL_SHARED_READ, @@ -27250,7 +27255,7 @@ case 1109: /* Line 1792 of yacc.c */ -#line 8562 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8567 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (4)].table), NULL, (yyvsp[(4) - (4)].num), TL_READ, MDL_SHARED_READ, @@ -27261,7 +27266,7 @@ case 1110: /* Line 1792 of yacc.c */ -#line 8572 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8577 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->alter_info.flags|= Alter_info::ALTER_ADMIN_PARTITION; } @@ -27269,7 +27274,7 @@ case 1112: /* Line 1792 of yacc.c */ -#line 8579 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8584 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->select_lex.alloc_index_hints(YYTHD); Select->set_index_hint_type(INDEX_HINT_USE, @@ -27281,25 +27286,25 @@ case 1114: /* Line 1792 of yacc.c */ -#line 8590 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8595 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 1116: /* Line 1792 of yacc.c */ -#line 8596 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8601 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 1117: /* Line 1792 of yacc.c */ -#line 8597 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8602 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TL_OPTION_IGNORE_LEAVES; } break; case 1118: /* Line 1792 of yacc.c */ -#line 8607 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8612 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SELECT; @@ -27308,7 +27313,7 @@ case 1121: /* Line 1792 of yacc.c */ -#line 8621 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8626 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (setup_select_in_parentheses(Lex)) MYSQL_YYABORT; @@ -27317,7 +27322,7 @@ case 1123: /* Line 1792 of yacc.c */ -#line 8631 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8636 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (setup_select_in_parentheses(Lex)) MYSQL_YYABORT; @@ -27326,7 +27331,7 @@ case 1125: /* Line 1792 of yacc.c */ -#line 8640 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8645 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX * sel= lex->current_select; @@ -27346,7 +27351,7 @@ case 1127: /* Line 1792 of yacc.c */ -#line 8659 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8664 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -27358,7 +27363,7 @@ case 1128: /* Line 1792 of yacc.c */ -#line 8667 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8672 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -27366,13 +27371,13 @@ case 1130: /* Line 1792 of yacc.c */ -#line 8674 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8679 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1135: /* Line 1792 of yacc.c */ -#line 8684 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8689 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->context.table_list= Select->context.first_name_resolution_table= @@ -27382,7 +27387,7 @@ case 1138: /* Line 1792 of yacc.c */ -#line 8699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL) { @@ -27394,7 +27399,7 @@ case 1142: /* Line 1792 of yacc.c */ -#line 8716 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8721 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Allow this flag only on the first top-level SELECT statement, if @@ -27426,7 +27431,7 @@ case 1143: /* Line 1792 of yacc.c */ -#line 8744 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8749 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Allow this flag only on the first top-level SELECT statement, if @@ -27458,7 +27463,7 @@ case 1145: /* Line 1792 of yacc.c */ -#line 8776 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8781 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->describe) @@ -27471,7 +27476,7 @@ case 1146: /* Line 1792 of yacc.c */ -#line 8785 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8790 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->describe) @@ -27485,7 +27490,7 @@ case 1149: /* Line 1792 of yacc.c */ -#line 8800 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8805 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Item *item= new (thd->mem_root) @@ -27501,7 +27506,7 @@ case 1150: /* Line 1792 of yacc.c */ -#line 8815 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8820 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; @@ -27512,7 +27517,7 @@ case 1151: /* Line 1792 of yacc.c */ -#line 8822 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8827 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; DBUG_ASSERT((yyvsp[(1) - (4)].simple_string) < (yyvsp[(3) - (4)].simple_string)); @@ -27538,7 +27543,7 @@ case 1152: /* Line 1792 of yacc.c */ -#line 8846 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8851 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start(); } @@ -27546,7 +27551,7 @@ case 1153: /* Line 1792 of yacc.c */ -#line 8852 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8857 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_end(); } @@ -27554,49 +27559,49 @@ case 1154: /* Line 1792 of yacc.c */ -#line 8858 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8863 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=null_lex_str;} break; case 1155: /* Line 1792 of yacc.c */ -#line 8859 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8864 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); } break; case 1156: /* Line 1792 of yacc.c */ -#line 8860 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8865 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); } break; case 1157: /* Line 1792 of yacc.c */ -#line 8861 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8866 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); } break; case 1158: /* Line 1792 of yacc.c */ -#line 8862 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8867 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); } break; case 1159: /* Line 1792 of yacc.c */ -#line 8866 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8871 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1160: /* Line 1792 of yacc.c */ -#line 8867 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8872 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1161: /* Line 1792 of yacc.c */ -#line 8873 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8878 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Design notes: @@ -27651,7 +27656,7 @@ case 1162: /* Line 1792 of yacc.c */ -#line 8924 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8929 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* XOR is a proprietary extension */ (yyval.item) = new (YYTHD->mem_root) Item_func_xor((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); @@ -27662,7 +27667,7 @@ case 1163: /* Line 1792 of yacc.c */ -#line 8931 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8936 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* See comments in rule expr: expr or expr */ Item_cond_and *item1; @@ -27709,7 +27714,7 @@ case 1164: /* Line 1792 of yacc.c */ -#line 8974 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8979 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item)); if ((yyval.item) == NULL) @@ -27719,7 +27724,7 @@ case 1165: /* Line 1792 of yacc.c */ -#line 8980 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8985 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item)); if ((yyval.item) == NULL) @@ -27729,7 +27734,7 @@ case 1166: /* Line 1792 of yacc.c */ -#line 8986 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8991 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item)); if ((yyval.item) == NULL) @@ -27739,7 +27744,7 @@ case 1167: /* Line 1792 of yacc.c */ -#line 8992 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 8997 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item)); if ((yyval.item) == NULL) @@ -27749,7 +27754,7 @@ case 1168: /* Line 1792 of yacc.c */ -#line 8998 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9003 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item)); if ((yyval.item) == NULL) @@ -27759,7 +27764,7 @@ case 1169: /* Line 1792 of yacc.c */ -#line 9004 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9009 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item)); if ((yyval.item) == NULL) @@ -27769,7 +27774,7 @@ case 1170: /* Line 1792 of yacc.c */ -#line 9010 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9015 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item)); if ((yyval.item) == NULL) @@ -27779,7 +27784,7 @@ case 1172: /* Line 1792 of yacc.c */ -#line 9020 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9025 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item)); if ((yyval.item) == NULL) @@ -27789,7 +27794,7 @@ case 1173: /* Line 1792 of yacc.c */ -#line 9026 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9031 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item)); if ((yyval.item) == NULL) @@ -27799,7 +27804,7 @@ case 1174: /* Line 1792 of yacc.c */ -#line 9032 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9037 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -27809,7 +27814,7 @@ case 1175: /* Line 1792 of yacc.c */ -#line 9038 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9043 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -27819,7 +27824,7 @@ case 1176: /* Line 1792 of yacc.c */ -#line 9044 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9049 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= all_any_subquery_creator((yyvsp[(1) - (6)].item), (yyvsp[(2) - (6)].boolfunc2creator), (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].select_lex)); if ((yyval.item) == NULL) @@ -27829,7 +27834,7 @@ case 1178: /* Line 1792 of yacc.c */ -#line 9054 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9059 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_in_subselect((yyvsp[(1) - (5)].item), (yyvsp[(4) - (5)].select_lex)); if ((yyval.item) == NULL) @@ -27839,7 +27844,7 @@ case 1179: /* Line 1792 of yacc.c */ -#line 9060 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9065 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (6)].item), (yyvsp[(5) - (6)].select_lex)); @@ -27853,7 +27858,7 @@ case 1180: /* Line 1792 of yacc.c */ -#line 9070 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9075 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (5)].item), true, (yyvsp[(4) - (5)].item)); if ((yyval.item) == NULL) @@ -27863,7 +27868,7 @@ case 1181: /* Line 1792 of yacc.c */ -#line 9076 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9081 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(4) - (7)].item)); (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(1) - (7)].item)); @@ -27875,7 +27880,7 @@ case 1182: /* Line 1792 of yacc.c */ -#line 9084 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9089 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (6)].item), false, (yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -27885,7 +27890,7 @@ case 1183: /* Line 1792 of yacc.c */ -#line 9090 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9095 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item)); (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(1) - (8)].item)); @@ -27899,7 +27904,7 @@ case 1184: /* Line 1792 of yacc.c */ -#line 9100 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9105 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (5)].item),(yyvsp[(3) - (5)].item),(yyvsp[(5) - (5)].item)); if ((yyval.item) == NULL) @@ -27909,7 +27914,7 @@ case 1185: /* Line 1792 of yacc.c */ -#line 9106 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9111 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_func_between *item; item= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (6)].item),(yyvsp[(4) - (6)].item),(yyvsp[(6) - (6)].item)); @@ -27922,7 +27927,7 @@ case 1186: /* Line 1792 of yacc.c */ -#line 9115 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9120 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item1= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(1) - (4)].item)); Item *item4= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(4) - (4)].item)); @@ -27936,7 +27941,7 @@ case 1187: /* Line 1792 of yacc.c */ -#line 9125 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9130 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].item),Lex->escape_used); if ((yyval.item) == NULL) @@ -27946,7 +27951,7 @@ case 1188: /* Line 1792 of yacc.c */ -#line 9131 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9136 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].item), Lex->escape_used); @@ -27960,7 +27965,7 @@ case 1189: /* Line 1792 of yacc.c */ -#line 9141 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9146 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -27970,7 +27975,7 @@ case 1190: /* Line 1792 of yacc.c */ -#line 9147 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9152 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (4)].item),(yyvsp[(4) - (4)].item)); if (item == NULL) @@ -27983,7 +27988,7 @@ case 1192: /* Line 1792 of yacc.c */ -#line 9160 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9165 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_bit_or((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -27993,7 +27998,7 @@ case 1193: /* Line 1792 of yacc.c */ -#line 9166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28003,7 +28008,7 @@ case 1194: /* Line 1792 of yacc.c */ -#line 9172 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9177 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28013,7 +28018,7 @@ case 1195: /* Line 1792 of yacc.c */ -#line 9178 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9183 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28023,7 +28028,7 @@ case 1196: /* Line 1792 of yacc.c */ -#line 9184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28033,7 +28038,7 @@ case 1197: /* Line 1792 of yacc.c */ -#line 9190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28043,7 +28048,7 @@ case 1198: /* Line 1792 of yacc.c */ -#line 9196 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9201 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),0); if ((yyval.item) == NULL) @@ -28053,7 +28058,7 @@ case 1199: /* Line 1792 of yacc.c */ -#line 9202 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9207 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),1); if ((yyval.item) == NULL) @@ -28063,7 +28068,7 @@ case 1200: /* Line 1792 of yacc.c */ -#line 9208 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9213 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28073,7 +28078,7 @@ case 1201: /* Line 1792 of yacc.c */ -#line 9214 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9219 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28083,7 +28088,7 @@ case 1202: /* Line 1792 of yacc.c */ -#line 9220 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9225 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28093,7 +28098,7 @@ case 1203: /* Line 1792 of yacc.c */ -#line 9226 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9231 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_int_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28103,7 +28108,7 @@ case 1204: /* Line 1792 of yacc.c */ -#line 9232 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9237 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28113,7 +28118,7 @@ case 1205: /* Line 1792 of yacc.c */ -#line 9238 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9243 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_bit_xor((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28123,55 +28128,55 @@ case 1215: /* Line 1792 of yacc.c */ -#line 9267 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9272 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_eq_creator; } break; case 1216: /* Line 1792 of yacc.c */ -#line 9268 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9273 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_ge_creator; } break; case 1217: /* Line 1792 of yacc.c */ -#line 9269 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9274 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_gt_creator; } break; case 1218: /* Line 1792 of yacc.c */ -#line 9270 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9275 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_le_creator; } break; case 1219: /* Line 1792 of yacc.c */ -#line 9271 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9276 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_lt_creator; } break; case 1220: /* Line 1792 of yacc.c */ -#line 9272 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.boolfunc2creator) = &comp_ne_creator; } break; case 1221: /* Line 1792 of yacc.c */ -#line 9276 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9281 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) = 1; } break; case 1222: /* Line 1792 of yacc.c */ -#line 9277 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9282 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) = 0; } break; case 1228: /* Line 1792 of yacc.c */ -#line 9287 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9292 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Item *i1= new (thd->mem_root) Item_string((yyvsp[(3) - (3)].lex_str).str, @@ -28187,7 +28192,7 @@ case 1233: /* Line 1792 of yacc.c */ -#line 9303 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9308 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_concat((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); if ((yyval.item) == NULL) @@ -28197,7 +28202,7 @@ case 1234: /* Line 1792 of yacc.c */ -#line 9309 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9314 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(2) - (2)].item); } @@ -28205,7 +28210,7 @@ case 1235: /* Line 1792 of yacc.c */ -#line 9313 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9318 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_neg((yyvsp[(2) - (2)].item)); if ((yyval.item) == NULL) @@ -28215,7 +28220,7 @@ case 1236: /* Line 1792 of yacc.c */ -#line 9319 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9324 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_bit_neg((yyvsp[(2) - (2)].item)); if ((yyval.item) == NULL) @@ -28225,7 +28230,7 @@ case 1237: /* Line 1792 of yacc.c */ -#line 9325 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9330 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item)); if ((yyval.item) == NULL) @@ -28235,7 +28240,7 @@ case 1238: /* Line 1792 of yacc.c */ -#line 9331 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9336 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_singlerow_subselect((yyvsp[(2) - (3)].select_lex)); if ((yyval.item) == NULL) @@ -28245,13 +28250,13 @@ case 1239: /* Line 1792 of yacc.c */ -#line 9337 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9342 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(2) - (3)].item); } break; case 1240: /* Line 1792 of yacc.c */ -#line 9339 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(4) - (5)].item_list)->push_front((yyvsp[(2) - (5)].item)); (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(4) - (5)].item_list)); @@ -28262,7 +28267,7 @@ case 1241: /* Line 1792 of yacc.c */ -#line 9346 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9351 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item)); (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(5) - (6)].item_list)); @@ -28273,7 +28278,7 @@ case 1242: /* Line 1792 of yacc.c */ -#line 9353 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9358 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_exists_subselect((yyvsp[(3) - (4)].select_lex)); if ((yyval.item) == NULL) @@ -28283,7 +28288,7 @@ case 1243: /* Line 1792 of yacc.c */ -#line 9359 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9364 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_string *item; (yyval.item)= NULL; @@ -28328,7 +28333,7 @@ case 1244: /* Line 1792 of yacc.c */ -#line 9400 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9405 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(2) - (7)].item_list)->push_front((yyvsp[(5) - (7)].item)); Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*(yyvsp[(2) - (7)].item_list), (yyvsp[(6) - (7)].num)); @@ -28341,7 +28346,7 @@ case 1245: /* Line 1792 of yacc.c */ -#line 9409 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9414 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= create_func_cast(YYTHD, (yyvsp[(2) - (2)].item), ITEM_CAST_CHAR, NULL, NULL, &my_charset_bin); @@ -28352,7 +28357,7 @@ case 1246: /* Line 1792 of yacc.c */ -#line 9416 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9421 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), lex->length, lex->dec, @@ -28364,7 +28369,7 @@ case 1247: /* Line 1792 of yacc.c */ -#line 9424 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9429 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_case(* (yyvsp[(3) - (5)].item_list), (yyvsp[(2) - (5)].item), (yyvsp[(4) - (5)].item) ); if ((yyval.item) == NULL) @@ -28374,7 +28379,7 @@ case 1248: /* Line 1792 of yacc.c */ -#line 9430 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9435 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), Lex->length, Lex->dec, Lex->charset); @@ -28385,7 +28390,7 @@ case 1249: /* Line 1792 of yacc.c */ -#line 9437 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9442 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_conv_charset((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].charset)); if ((yyval.item) == NULL) @@ -28395,7 +28400,7 @@ case 1250: /* Line 1792 of yacc.c */ -#line 9443 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9448 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(3) - (4)].item)->is_splocal()) { @@ -28413,7 +28418,7 @@ case 1251: /* Line 1792 of yacc.c */ -#line 9457 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9462 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(), (yyvsp[(3) - (4)].item)); @@ -28424,7 +28429,7 @@ case 1252: /* Line 1792 of yacc.c */ -#line 9465 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9470 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(5) - (5)].item),(yyvsp[(2) - (5)].item),(yyvsp[(3) - (5)].interval),0); if ((yyval.item) == NULL) @@ -28434,7 +28439,7 @@ case 1253: /* Line 1792 of yacc.c */ -#line 9480 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9485 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (4)].item_list)); if ((yyval.item) == NULL) @@ -28444,7 +28449,7 @@ case 1254: /* Line 1792 of yacc.c */ -#line 9486 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9491 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (6)].item_list), (yyvsp[(5) - (6)].charset)); if ((yyval.item) == NULL) @@ -28454,7 +28459,7 @@ case 1255: /* Line 1792 of yacc.c */ -#line 9492 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9497 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); if ((yyval.item) == NULL) @@ -28466,7 +28471,7 @@ case 1256: /* Line 1792 of yacc.c */ -#line 9500 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9505 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_typecast((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28476,7 +28481,7 @@ case 1257: /* Line 1792 of yacc.c */ -#line 9506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_dayofmonth((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28486,7 +28491,7 @@ case 1258: /* Line 1792 of yacc.c */ -#line 9512 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9517 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_hour((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28496,7 +28501,7 @@ case 1259: /* Line 1792 of yacc.c */ -#line 9518 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9523 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_insert((yyvsp[(3) - (10)].item),(yyvsp[(5) - (10)].item),(yyvsp[(7) - (10)].item),(yyvsp[(9) - (10)].item)); if ((yyval.item) == NULL) @@ -28506,7 +28511,7 @@ case 1260: /* Line 1792 of yacc.c */ -#line 9524 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9529 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; List *list= new (thd->mem_root) List; @@ -28525,7 +28530,7 @@ case 1261: /* Line 1792 of yacc.c */ -#line 9539 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9544 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item)); @@ -28541,7 +28546,7 @@ case 1262: /* Line 1792 of yacc.c */ -#line 9551 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9556 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_left((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28551,7 +28556,7 @@ case 1263: /* Line 1792 of yacc.c */ -#line 9557 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9562 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_minute((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28561,7 +28566,7 @@ case 1264: /* Line 1792 of yacc.c */ -#line 9563 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9568 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_month((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28571,7 +28576,7 @@ case 1265: /* Line 1792 of yacc.c */ -#line 9569 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9574 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28581,7 +28586,7 @@ case 1266: /* Line 1792 of yacc.c */ -#line 9575 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9580 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_second((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28591,7 +28596,7 @@ case 1267: /* Line 1792 of yacc.c */ -#line 9581 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9586 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28601,7 +28606,7 @@ case 1268: /* Line 1792 of yacc.c */ -#line 9587 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9592 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28611,7 +28616,7 @@ case 1269: /* Line 1792 of yacc.c */ -#line 9593 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9598 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0); if ((yyval.item) == NULL) @@ -28621,7 +28626,7 @@ case 1270: /* Line 1792 of yacc.c */ -#line 9599 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9604 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28631,7 +28636,7 @@ case 1271: /* Line 1792 of yacc.c */ -#line 9605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); if ((yyval.item) == NULL) @@ -28641,7 +28646,7 @@ case 1272: /* Line 1792 of yacc.c */ -#line 9611 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9616 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); if ((yyval.item) == NULL) @@ -28651,7 +28656,7 @@ case 1273: /* Line 1792 of yacc.c */ -#line 9617 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9622 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item)); if ((yyval.item) == NULL) @@ -28661,7 +28666,7 @@ case 1274: /* Line 1792 of yacc.c */ -#line 9623 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9628 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28671,7 +28676,7 @@ case 1275: /* Line 1792 of yacc.c */ -#line 9629 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9634 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28681,7 +28686,7 @@ case 1276: /* Line 1792 of yacc.c */ -#line 9635 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9640 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28691,7 +28696,7 @@ case 1277: /* Line 1792 of yacc.c */ -#line 9641 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9646 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item)); if ((yyval.item) == NULL) @@ -28701,7 +28706,7 @@ case 1278: /* Line 1792 of yacc.c */ -#line 9647 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9652 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_user(); if ((yyval.item) == NULL) @@ -28713,7 +28718,7 @@ case 1279: /* Line 1792 of yacc.c */ -#line 9655 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9660 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_year((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28723,7 +28728,7 @@ case 1280: /* Line 1792 of yacc.c */ -#line 9676 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9681 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), INTERVAL_DAY, 0); @@ -28734,7 +28739,7 @@ case 1281: /* Line 1792 of yacc.c */ -#line 9683 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9688 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 0); if ((yyval.item) == NULL) @@ -28744,7 +28749,7 @@ case 1282: /* Line 1792 of yacc.c */ -#line 9689 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9694 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_local(); if ((yyval.item) == NULL) @@ -28755,7 +28760,7 @@ case 1283: /* Line 1792 of yacc.c */ -#line 9696 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9701 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local((yyvsp[(2) - (2)].ulong_num)); if ((yyval.item) == NULL) @@ -28766,7 +28771,7 @@ case 1284: /* Line 1792 of yacc.c */ -#line 9704 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9709 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),0); if ((yyval.item) == NULL) @@ -28776,7 +28781,7 @@ case 1285: /* Line 1792 of yacc.c */ -#line 9711 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9716 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),1); if ((yyval.item) == NULL) @@ -28786,7 +28791,7 @@ case 1286: /* Line 1792 of yacc.c */ -#line 9717 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9722 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=new (YYTHD->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28796,7 +28801,7 @@ case 1287: /* Line 1792 of yacc.c */ -#line 9723 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9728 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28806,7 +28811,7 @@ case 1288: /* Line 1792 of yacc.c */ -#line 9729 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9734 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); Lex->safe_to_cache_query= 0; @@ -28815,7 +28820,7 @@ case 1289: /* Line 1792 of yacc.c */ -#line 9734 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9739 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = new (YYTHD->mem_root) Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item)); if ((yyval.item) == NULL) @@ -28825,7 +28830,7 @@ case 1290: /* Line 1792 of yacc.c */ -#line 9740 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9745 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), INTERVAL_DAY, 1); @@ -28836,7 +28841,7 @@ case 1291: /* Line 1792 of yacc.c */ -#line 9747 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9752 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 1); if ((yyval.item) == NULL) @@ -28846,7 +28851,7 @@ case 1292: /* Line 1792 of yacc.c */ -#line 9753 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9758 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); if ((yyval.item) == NULL) @@ -28856,7 +28861,7 @@ case 1293: /* Line 1792 of yacc.c */ -#line 9759 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9764 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28866,7 +28871,7 @@ case 1294: /* Line 1792 of yacc.c */ -#line 9765 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9770 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); if ((yyval.item) == NULL) @@ -28876,7 +28881,7 @@ case 1295: /* Line 1792 of yacc.c */ -#line 9771 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9776 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -28886,7 +28891,7 @@ case 1296: /* Line 1792 of yacc.c */ -#line 9777 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9782 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Unlike other time-related functions, SYSDATE() is @@ -28908,7 +28913,7 @@ case 1297: /* Line 1792 of yacc.c */ -#line 9795 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9800 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(7) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].interval_time_st),0); if ((yyval.item) == NULL) @@ -28918,7 +28923,7 @@ case 1298: /* Line 1792 of yacc.c */ -#line 9801 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9806 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_timestamp_diff((yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item),(yyvsp[(3) - (8)].interval_time_st)); if ((yyval.item) == NULL) @@ -28928,7 +28933,7 @@ case 1299: /* Line 1792 of yacc.c */ -#line 9807 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9812 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_utc(); if ((yyval.item) == NULL) @@ -28939,7 +28944,7 @@ case 1300: /* Line 1792 of yacc.c */ -#line 9814 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9819 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_utc((yyvsp[(2) - (2)].ulong_num)); if ((yyval.item) == NULL) @@ -28950,7 +28955,7 @@ case 1301: /* Line 1792 of yacc.c */ -#line 9821 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9826 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_now_utc((yyvsp[(2) - (2)].ulong_num)); if ((yyval.item) == NULL) @@ -28961,7 +28966,7 @@ case 1302: /* Line 1792 of yacc.c */ -#line 9836 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9841 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_ascii((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28971,7 +28976,7 @@ case 1303: /* Line 1792 of yacc.c */ -#line 9842 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9847 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_charset((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -28981,7 +28986,7 @@ case 1304: /* Line 1792 of yacc.c */ -#line 9848 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9853 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list)); if ((yyval.item) == NULL) @@ -28991,7 +28996,7 @@ case 1305: /* Line 1792 of yacc.c */ -#line 9854 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9859 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_collation((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29001,7 +29006,7 @@ case 1306: /* Line 1792 of yacc.c */ -#line 9860 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9865 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_database(); if ((yyval.item) == NULL) @@ -29012,7 +29017,7 @@ case 1307: /* Line 1792 of yacc.c */ -#line 9867 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9872 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_if((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); if ((yyval.item) == NULL) @@ -29022,7 +29027,7 @@ case 1308: /* Line 1792 of yacc.c */ -#line 9873 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9878 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_format((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -29032,7 +29037,7 @@ case 1309: /* Line 1792 of yacc.c */ -#line 9879 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9884 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_format((yyvsp[(3) - (8)].item), (yyvsp[(5) - (8)].item), (yyvsp[(7) - (8)].item)); if ((yyval.item) == NULL) @@ -29042,7 +29047,7 @@ case 1310: /* Line 1792 of yacc.c */ -#line 9885 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9890 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29052,7 +29057,7 @@ case 1311: /* Line 1792 of yacc.c */ -#line 9891 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9896 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = new (YYTHD->mem_root) Item_func_mod((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -29062,7 +29067,7 @@ case 1312: /* Line 1792 of yacc.c */ -#line 9897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD"); (yyval.item)= new (YYTHD->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item)); @@ -29074,7 +29079,7 @@ case 1313: /* Line 1792 of yacc.c */ -#line 9905 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9910 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Item* i1; @@ -29091,7 +29096,7 @@ case 1314: /* Line 1792 of yacc.c */ -#line 9918 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9923 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = new (YYTHD->mem_root) Item_func_quarter((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29101,7 +29106,7 @@ case 1315: /* Line 1792 of yacc.c */ -#line 9924 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9929 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_repeat((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -29111,7 +29116,7 @@ case 1316: /* Line 1792 of yacc.c */ -#line 9930 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9935 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_replace((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item)); if ((yyval.item) == NULL) @@ -29121,7 +29126,7 @@ case 1317: /* Line 1792 of yacc.c */ -#line 9936 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9941 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_reverse((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29131,7 +29136,7 @@ case 1318: /* Line 1792 of yacc.c */ -#line 9942 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9947 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_row_count(); if ((yyval.item) == NULL) @@ -29143,7 +29148,7 @@ case 1319: /* Line 1792 of yacc.c */ -#line 9950 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9955 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_round((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item),1); if ((yyval.item) == NULL) @@ -29153,7 +29158,7 @@ case 1320: /* Line 1792 of yacc.c */ -#line 9956 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9961 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"), @@ -29169,7 +29174,7 @@ case 1321: /* Line 1792 of yacc.c */ -#line 9968 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9973 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_week((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)); if ((yyval.item) == NULL) @@ -29179,7 +29184,7 @@ case 1322: /* Line 1792 of yacc.c */ -#line 9974 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9979 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_weight_string((yyvsp[(3) - (5)].item), 0, 0, (yyvsp[(4) - (5)].ulong_num)); if ((yyval.item) == NULL) @@ -29189,7 +29194,7 @@ case 1323: /* Line 1792 of yacc.c */ -#line 9980 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9985 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_weight_string((yyvsp[(3) - (8)].item), 0, (yyvsp[(6) - (8)].ulong_num), @@ -29201,7 +29206,7 @@ case 1324: /* Line 1792 of yacc.c */ -#line 9988 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 9993 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item= new (YYTHD->mem_root) Item_char_typecast((yyvsp[(3) - (7)].item), (yyvsp[(6) - (7)].ulong_num), &my_charset_bin); if (item == NULL) @@ -29215,7 +29220,7 @@ case 1325: /* Line 1792 of yacc.c */ -#line 9998 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10003 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_weight_string((yyvsp[(3) - (10)].item), (yyvsp[(5) - (10)].ulong_num), (yyvsp[(7) - (10)].ulong_num), (yyvsp[(9) - (10)].ulong_num)); if ((yyval.item) == NULL) @@ -29225,7 +29230,7 @@ case 1326: /* Line 1792 of yacc.c */ -#line 10004 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10009 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_SPATIAL (yyval.item)= (yyvsp[(1) - (1)].item); @@ -29242,7 +29247,7 @@ case 1327: /* Line 1792 of yacc.c */ -#line 10020 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10025 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_mbr_rel((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), @@ -29252,7 +29257,7 @@ case 1328: /* Line 1792 of yacc.c */ -#line 10026 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10031 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29263,7 +29268,7 @@ case 1329: /* Line 1792 of yacc.c */ -#line 10033 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10038 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29274,7 +29279,7 @@ case 1330: /* Line 1792 of yacc.c */ -#line 10040 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10045 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29285,7 +29290,7 @@ case 1331: /* Line 1792 of yacc.c */ -#line 10047 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10052 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29296,7 +29301,7 @@ case 1332: /* Line 1792 of yacc.c */ -#line 10054 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10059 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29307,7 +29312,7 @@ case 1333: /* Line 1792 of yacc.c */ -#line 10061 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10066 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_point((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item))); } @@ -29315,7 +29320,7 @@ case 1334: /* Line 1792 of yacc.c */ -#line 10065 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10070 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= GEOM_NEW(YYTHD, Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list), @@ -29326,7 +29331,7 @@ case 1335: /* Line 1792 of yacc.c */ -#line 10084 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10089 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_DLOPEN udf_func *udf= 0; @@ -29349,7 +29354,7 @@ case 1336: /* Line 1792 of yacc.c */ -#line 10103 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10108 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Create_func *builder; @@ -29407,7 +29412,7 @@ case 1337: /* Line 1792 of yacc.c */ -#line 10157 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10162 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Create_qfunc *builder; @@ -29448,55 +29453,55 @@ case 1338: /* Line 1792 of yacc.c */ -#line 10197 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10202 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); } break; case 1339: /* Line 1792 of yacc.c */ -#line 10199 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10204 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= FT_BOOL; } break; case 1340: /* Line 1792 of yacc.c */ -#line 10203 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10208 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= FT_NL; } break; case 1341: /* Line 1792 of yacc.c */ -#line 10204 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10209 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= FT_NL; } break; case 1342: /* Line 1792 of yacc.c */ -#line 10208 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10213 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 1343: /* Line 1792 of yacc.c */ -#line 10209 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10214 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= FT_EXPAND; } break; case 1344: /* Line 1792 of yacc.c */ -#line 10213 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10218 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= NULL; } break; case 1345: /* Line 1792 of yacc.c */ -#line 10214 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10219 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); } break; case 1346: /* Line 1792 of yacc.c */ -#line 10219 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10224 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= new (YYTHD->mem_root) List; if ((yyval.item_list) == NULL) @@ -29507,7 +29512,7 @@ case 1347: /* Line 1792 of yacc.c */ -#line 10226 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10231 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item)); (yyval.item_list)= (yyvsp[(1) - (3)].item_list); @@ -29516,7 +29521,7 @@ case 1348: /* Line 1792 of yacc.c */ -#line 10234 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10239 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Use Item::name as a storage for the attribute value of user @@ -29543,7 +29548,7 @@ case 1349: /* Line 1792 of yacc.c */ -#line 10260 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10265 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(3) - (4)].item), FALSE); if ((yyval.item) == NULL) @@ -29553,7 +29558,7 @@ case 1350: /* Line 1792 of yacc.c */ -#line 10266 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10271 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(4) - (5)].item), TRUE); if ((yyval.item) == NULL) @@ -29563,7 +29568,7 @@ case 1351: /* Line 1792 of yacc.c */ -#line 10272 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_and((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29573,7 +29578,7 @@ case 1352: /* Line 1792 of yacc.c */ -#line 10278 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10283 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_or((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29583,7 +29588,7 @@ case 1353: /* Line 1792 of yacc.c */ -#line 10284 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10289 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_xor((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29593,7 +29598,7 @@ case 1354: /* Line 1792 of yacc.c */ -#line 10290 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10295 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1); if (item == NULL) @@ -29606,7 +29611,7 @@ case 1355: /* Line 1792 of yacc.c */ -#line 10299 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10304 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_count((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29616,19 +29621,19 @@ case 1356: /* Line 1792 of yacc.c */ -#line 10305 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10310 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->in_sum_expr++; } break; case 1357: /* Line 1792 of yacc.c */ -#line 10307 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10312 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->in_sum_expr--; } break; case 1358: /* Line 1792 of yacc.c */ -#line 10309 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10314 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_count(* (yyvsp[(5) - (7)].item_list)); if ((yyval.item) == NULL) @@ -29638,7 +29643,7 @@ case 1359: /* Line 1792 of yacc.c */ -#line 10315 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10320 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29648,7 +29653,7 @@ case 1360: /* Line 1792 of yacc.c */ -#line 10326 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10331 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(4) - (5)].item)); if ((yyval.item) == NULL) @@ -29658,7 +29663,7 @@ case 1361: /* Line 1792 of yacc.c */ -#line 10332 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10337 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(3) - (4)].item)); if ((yyval.item) == NULL) @@ -29668,7 +29673,7 @@ case 1362: /* Line 1792 of yacc.c */ -#line 10338 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10343 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(4) - (5)].item)); if ((yyval.item) == NULL) @@ -29678,7 +29683,7 @@ case 1363: /* Line 1792 of yacc.c */ -#line 10344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0); if ((yyval.item) == NULL) @@ -29688,7 +29693,7 @@ case 1364: /* Line 1792 of yacc.c */ -#line 10350 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10355 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0); if ((yyval.item) == NULL) @@ -29698,7 +29703,7 @@ case 1365: /* Line 1792 of yacc.c */ -#line 10356 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10361 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1); if ((yyval.item) == NULL) @@ -29708,7 +29713,7 @@ case 1366: /* Line 1792 of yacc.c */ -#line 10362 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10367 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1); if ((yyval.item) == NULL) @@ -29718,7 +29723,7 @@ case 1367: /* Line 1792 of yacc.c */ -#line 10368 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10373 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE); if ((yyval.item) == NULL) @@ -29728,7 +29733,7 @@ case 1368: /* Line 1792 of yacc.c */ -#line 10374 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10379 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(4) - (5)].item), TRUE); if ((yyval.item) == NULL) @@ -29738,13 +29743,13 @@ case 1369: /* Line 1792 of yacc.c */ -#line 10380 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10385 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->in_sum_expr++; } break; case 1370: /* Line 1792 of yacc.c */ -#line 10384 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10389 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->in_sum_expr--; @@ -29760,7 +29765,7 @@ case 1371: /* Line 1792 of yacc.c */ -#line 10399 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10404 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (! Lex->parsing_options.allows_variable) { @@ -29772,7 +29777,7 @@ case 1372: /* Line 1792 of yacc.c */ -#line 10407 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10412 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(3) - (3)].item); } @@ -29780,7 +29785,7 @@ case 1373: /* Line 1792 of yacc.c */ -#line 10414 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10419 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_func_set_user_var *item; (yyval.item)= item= @@ -29795,7 +29800,7 @@ case 1374: /* Line 1792 of yacc.c */ -#line 10425 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10430 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(1) - (1)].lex_str)); if ((yyval.item) == NULL) @@ -29807,7 +29812,7 @@ case 1375: /* Line 1792 of yacc.c */ -#line 10433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* disallow "SELECT @@global.global.variable" */ if ((yyvsp[(3) - (4)].lex_str).str && (yyvsp[(4) - (4)].lex_str).str && check_reserved_words(&(yyvsp[(3) - (4)].lex_str))) @@ -29824,19 +29829,19 @@ case 1376: /* Line 1792 of yacc.c */ -#line 10448 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10453 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) = 0; } break; case 1377: /* Line 1792 of yacc.c */ -#line 10449 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10454 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) = 1; } break; case 1378: /* Line 1792 of yacc.c */ -#line 10454 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10459 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.string)= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); if ((yyval.string) == NULL) @@ -29846,13 +29851,13 @@ case 1379: /* Line 1792 of yacc.c */ -#line 10459 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10464 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.string) = (yyvsp[(2) - (2)].string); } break; case 1381: /* Line 1792 of yacc.c */ -#line 10465 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10470 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -29869,19 +29874,19 @@ case 1383: /* Line 1792 of yacc.c */ -#line 10482 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10487 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_gorder_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; } break; case 1384: /* Line 1792 of yacc.c */ -#line 10484 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10489 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_gorder_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; } break; case 1385: /* Line 1792 of yacc.c */ -#line 10489 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10494 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->current_select->inc_in_sum_expr()) @@ -29894,7 +29899,7 @@ case 1386: /* Line 1792 of yacc.c */ -#line 10498 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10503 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->in_sum_expr--; (yyval.item)= (yyvsp[(3) - (3)].item); @@ -29903,85 +29908,85 @@ case 1387: /* Line 1792 of yacc.c */ -#line 10506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; } break; case 1388: /* Line 1792 of yacc.c */ -#line 10508 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10513 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; } break; case 1389: /* Line 1792 of yacc.c */ -#line 10510 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10515 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; } break; case 1390: /* Line 1792 of yacc.c */ -#line 10512 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10517 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } break; case 1391: /* Line 1792 of yacc.c */ -#line 10514 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10519 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } break; case 1392: /* Line 1792 of yacc.c */ -#line 10516 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10521 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } break; case 1393: /* Line 1792 of yacc.c */ -#line 10518 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10523 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } break; case 1394: /* Line 1792 of yacc.c */ -#line 10520 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10525 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)= ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec= Lex->length= (char *) 0; } break; case 1395: /* Line 1792 of yacc.c */ -#line 10522 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10527 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)= ITEM_CAST_TIME; Lex->charset= NULL; Lex->length= (char *) 0; } break; case 1396: /* Line 1792 of yacc.c */ -#line 10524 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10529 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)= ITEM_CAST_DATETIME; Lex->charset= NULL; Lex->length= (char *) 0; } break; case 1397: /* Line 1792 of yacc.c */ -#line 10526 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10531 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; } break; case 1398: /* Line 1792 of yacc.c */ -#line 10530 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10535 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= NULL; } break; case 1399: /* Line 1792 of yacc.c */ -#line 10531 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10536 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= (yyvsp[(1) - (1)].item_list);} break; case 1400: /* Line 1792 of yacc.c */ -#line 10536 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10541 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= new (YYTHD->mem_root) List; if ((yyval.item_list) == NULL) @@ -29992,7 +29997,7 @@ case 1401: /* Line 1792 of yacc.c */ -#line 10543 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10548 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item)); (yyval.item_list)= (yyvsp[(1) - (3)].item_list); @@ -30001,19 +30006,19 @@ case 1402: /* Line 1792 of yacc.c */ -#line 10550 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10555 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); } break; case 1403: /* Line 1792 of yacc.c */ -#line 10551 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10556 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= (yyvsp[(2) - (3)].item_list); } break; case 1404: /* Line 1792 of yacc.c */ -#line 10556 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10561 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= new (YYTHD->mem_root) List; if ((yyval.item_list) == NULL) @@ -30024,7 +30029,7 @@ case 1405: /* Line 1792 of yacc.c */ -#line 10563 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10568 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item)); (yyval.item_list)= (yyvsp[(1) - (3)].item_list); @@ -30033,31 +30038,31 @@ case 1406: /* Line 1792 of yacc.c */ -#line 10570 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10575 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= NULL; } break; case 1407: /* Line 1792 of yacc.c */ -#line 10571 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10576 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 1408: /* Line 1792 of yacc.c */ -#line 10575 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10580 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= NULL; } break; case 1409: /* Line 1792 of yacc.c */ -#line 10576 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10581 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(2) - (2)].item); } break; case 1410: /* Line 1792 of yacc.c */ -#line 10581 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10586 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_list)= new List; if ((yyval.item_list) == NULL) @@ -30069,7 +30074,7 @@ case 1411: /* Line 1792 of yacc.c */ -#line 10589 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10594 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(3) - (5)].item)); (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(5) - (5)].item)); @@ -30079,13 +30084,13 @@ case 1412: /* Line 1792 of yacc.c */ -#line 10599 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10604 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); } break; case 1413: /* Line 1792 of yacc.c */ -#line 10601 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10606 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd))) @@ -30095,31 +30100,31 @@ case 1414: /* Line 1792 of yacc.c */ -#line 10609 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10614 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); } break; case 1415: /* Line 1792 of yacc.c */ -#line 10620 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10625 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); } break; case 1416: /* Line 1792 of yacc.c */ -#line 10621 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10626 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table_list)=(yyvsp[(3) - (4)].table_list); } break; case 1417: /* Line 1792 of yacc.c */ -#line 10627 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10632 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); } break; case 1418: /* Line 1792 of yacc.c */ -#line 10629 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10634 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); } @@ -30127,19 +30132,19 @@ case 1419: /* Line 1792 of yacc.c */ -#line 10649 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10654 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); } break; case 1420: /* Line 1792 of yacc.c */ -#line 10651 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10656 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); (yyvsp[(3) - (3)].table_list)->straight=1; } break; case 1421: /* Line 1792 of yacc.c */ -#line 10654 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10659 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list)); /* Change the current name resolution context to a local context. */ @@ -30151,7 +30156,7 @@ case 1422: /* Line 1792 of yacc.c */ -#line 10662 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10667 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item)); Lex->pop_context(); @@ -30161,7 +30166,7 @@ case 1423: /* Line 1792 of yacc.c */ -#line 10669 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10674 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list)); /* Change the current name resolution context to a local context. */ @@ -30173,7 +30178,7 @@ case 1424: /* Line 1792 of yacc.c */ -#line 10677 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10682 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(3) - (6)].table_list)->straight=1; add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item)); @@ -30184,7 +30189,7 @@ case 1425: /* Line 1792 of yacc.c */ -#line 10685 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10690 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list)); } @@ -30192,13 +30197,13 @@ case 1426: /* Line 1792 of yacc.c */ -#line 10689 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10694 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { add_join_natural((yyvsp[(1) - (8)].table_list),(yyvsp[(3) - (8)].table_list),(yyvsp[(7) - (8)].string_list),Select); (yyval.table_list)=(yyvsp[(3) - (8)].table_list); } break; case 1427: /* Line 1792 of yacc.c */ -#line 10691 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10696 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && ((yyval.table_list)=(yyvsp[(4) - (4)].table_list))); add_join_natural((yyvsp[(1) - (4)].table_list),(yyvsp[(4) - (4)].table_list),NULL,Select); @@ -30207,7 +30212,7 @@ case 1428: /* Line 1792 of yacc.c */ -#line 10699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list)); /* Change the current name resolution context to a local context. */ @@ -30219,7 +30224,7 @@ case 1429: /* Line 1792 of yacc.c */ -#line 10707 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10712 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { add_join_on((yyvsp[(5) - (8)].table_list),(yyvsp[(8) - (8)].item)); Lex->pop_context(); @@ -30231,7 +30236,7 @@ case 1430: /* Line 1792 of yacc.c */ -#line 10715 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10720 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list)); } @@ -30239,7 +30244,7 @@ case 1431: /* Line 1792 of yacc.c */ -#line 10719 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10724 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { add_join_natural((yyvsp[(1) - (10)].table_list),(yyvsp[(5) - (10)].table_list),(yyvsp[(9) - (10)].string_list),Select); (yyvsp[(5) - (10)].table_list)->outer_join|=JOIN_TYPE_LEFT; @@ -30249,7 +30254,7 @@ case 1432: /* Line 1792 of yacc.c */ -#line 10725 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10730 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list)); add_join_natural((yyvsp[(1) - (6)].table_list),(yyvsp[(6) - (6)].table_list),NULL,Select); @@ -30260,7 +30265,7 @@ case 1433: /* Line 1792 of yacc.c */ -#line 10735 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10740 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list)); /* Change the current name resolution context to a local context. */ @@ -30272,7 +30277,7 @@ case 1434: /* Line 1792 of yacc.c */ -#line 10743 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10748 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (!((yyval.table_list)= lex->current_select->convert_right_join())) @@ -30285,7 +30290,7 @@ case 1435: /* Line 1792 of yacc.c */ -#line 10752 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10757 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list)); } @@ -30293,7 +30298,7 @@ case 1436: /* Line 1792 of yacc.c */ -#line 10756 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10761 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (!((yyval.table_list)= lex->current_select->convert_right_join())) @@ -30304,7 +30309,7 @@ case 1437: /* Line 1792 of yacc.c */ -#line 10763 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10768 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list)); add_join_natural((yyvsp[(6) - (6)].table_list),(yyvsp[(1) - (6)].table_list),NULL,Select); @@ -30316,31 +30321,31 @@ case 1438: /* Line 1792 of yacc.c */ -#line 10773 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10778 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1439: /* Line 1792 of yacc.c */ -#line 10774 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10779 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1440: /* Line 1792 of yacc.c */ -#line 10775 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10780 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1441: /* Line 1792 of yacc.c */ -#line 10783 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10788 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.string_list)= 0;} break; case 1443: /* Line 1792 of yacc.c */ -#line 10789 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10794 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.string_list)= (yyvsp[(3) - (5)].string_list); } @@ -30348,7 +30353,7 @@ case 1444: /* Line 1792 of yacc.c */ -#line 10803 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10808 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->table_join_options= 0; @@ -30357,7 +30362,7 @@ case 1445: /* Line 1792 of yacc.c */ -#line 10808 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10813 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.table_list)= Select->add_table_to_list(YYTHD, (yyvsp[(2) - (5)].table), (yyvsp[(4) - (5)].lex_str_ptr), Select->get_table_join_options(), @@ -30372,7 +30377,7 @@ case 1446: /* Line 1792 of yacc.c */ -#line 10819 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10824 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -30398,7 +30403,7 @@ case 1447: /* Line 1792 of yacc.c */ -#line 10859 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10864 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Use $2 instead of Lex->current_select as derived table will alter value of Lex->current_select. */ @@ -30452,7 +30457,7 @@ case 1448: /* Line 1792 of yacc.c */ -#line 10932 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10937 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(1) - (2)].table_list) && (yyvsp[(2) - (2)].is_not_empty)) { @@ -30464,7 +30469,7 @@ case 1449: /* Line 1792 of yacc.c */ -#line 10942 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10947 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE)) MYSQL_YYABORT; @@ -30473,7 +30478,7 @@ case 1450: /* Line 1792 of yacc.c */ -#line 10947 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10952 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Remove from the name resolution context stack the context of the @@ -30485,7 +30490,7 @@ case 1451: /* Line 1792 of yacc.c */ -#line 10955 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10960 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(1) - (7)].table_list) != NULL) { @@ -30497,7 +30502,7 @@ case 1452: /* Line 1792 of yacc.c */ -#line 10967 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10972 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX * sel= lex->current_select; @@ -30517,7 +30522,7 @@ case 1453: /* Line 1792 of yacc.c */ -#line 10986 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10991 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -30529,7 +30534,7 @@ case 1454: /* Line 1792 of yacc.c */ -#line 10994 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 10999 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -30537,7 +30542,7 @@ case 1456: /* Line 1792 of yacc.c */ -#line 11003 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11008 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if ((yyvsp[(1) - (1)].select_lex)->init_nested_join(lex->thd)) @@ -30547,7 +30552,7 @@ case 1457: /* Line 1792 of yacc.c */ -#line 11009 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11014 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; /* for normal joins, $3 != NULL and end_nested_join() != NULL, @@ -30565,7 +30570,7 @@ case 1458: /* Line 1792 of yacc.c */ -#line 11025 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11030 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->derived_tables|= DERIVED_SUBQUERY; @@ -30586,7 +30591,7 @@ case 1459: /* Line 1792 of yacc.c */ -#line 11042 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11047 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -30594,13 +30599,13 @@ case 1461: /* Line 1792 of yacc.c */ -#line 11049 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11054 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.select_lex)= Select; } break; case 1462: /* Line 1792 of yacc.c */ -#line 11054 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11059 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -30627,19 +30632,19 @@ case 1463: /* Line 1792 of yacc.c */ -#line 11079 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11084 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1464: /* Line 1792 of yacc.c */ -#line 11080 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11085 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1465: /* Line 1792 of yacc.c */ -#line 11085 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11090 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= old_mode ? INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL; } @@ -30647,37 +30652,37 @@ case 1466: /* Line 1792 of yacc.c */ -#line 11088 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11093 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= INDEX_HINT_MASK_JOIN; } break; case 1467: /* Line 1792 of yacc.c */ -#line 11089 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11094 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= INDEX_HINT_MASK_ORDER; } break; case 1468: /* Line 1792 of yacc.c */ -#line 11090 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11095 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= INDEX_HINT_MASK_GROUP; } break; case 1469: /* Line 1792 of yacc.c */ -#line 11094 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11099 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.index_hint)= INDEX_HINT_FORCE; } break; case 1470: /* Line 1792 of yacc.c */ -#line 11095 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11100 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.index_hint)= INDEX_HINT_IGNORE; } break; case 1471: /* Line 1792 of yacc.c */ -#line 11100 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11105 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_index_hint_type((yyvsp[(1) - (3)].index_hint), (yyvsp[(3) - (3)].num)); } @@ -30685,7 +30690,7 @@ case 1473: /* Line 1792 of yacc.c */ -#line 11105 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11110 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_index_hint_type(INDEX_HINT_USE, (yyvsp[(3) - (3)].num)); } @@ -30693,43 +30698,43 @@ case 1478: /* Line 1792 of yacc.c */ -#line 11118 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11123 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->alloc_index_hints(YYTHD); } break; case 1480: /* Line 1792 of yacc.c */ -#line 11122 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11127 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->clear_index_hints(); } break; case 1482: /* Line 1792 of yacc.c */ -#line 11127 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11132 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->add_index_hint(YYTHD, NULL, 0); } break; case 1483: /* Line 1792 of yacc.c */ -#line 11128 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11133 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1484: /* Line 1792 of yacc.c */ -#line 11133 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11138 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->add_index_hint(YYTHD, (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); } break; case 1485: /* Line 1792 of yacc.c */ -#line 11135 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11140 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); } break; case 1488: /* Line 1792 of yacc.c */ -#line 11145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.string_list)= new List)) MYSQL_YYABORT; @@ -30744,7 +30749,7 @@ case 1489: /* Line 1792 of yacc.c */ -#line 11156 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11161 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { String *s= new (YYTHD->mem_root) String((const char *) (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length, @@ -30758,163 +30763,163 @@ case 1490: /* Line 1792 of yacc.c */ -#line 11168 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11173 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1491: /* Line 1792 of yacc.c */ -#line 11169 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11174 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_DAY_HOUR; } break; case 1492: /* Line 1792 of yacc.c */ -#line 11170 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_DAY_MICROSECOND; } break; case 1493: /* Line 1792 of yacc.c */ -#line 11171 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11176 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_DAY_MINUTE; } break; case 1494: /* Line 1792 of yacc.c */ -#line 11172 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11177 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_DAY_SECOND; } break; case 1495: /* Line 1792 of yacc.c */ -#line 11173 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11178 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_HOUR_MICROSECOND; } break; case 1496: /* Line 1792 of yacc.c */ -#line 11174 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11179 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_HOUR_MINUTE; } break; case 1497: /* Line 1792 of yacc.c */ -#line 11175 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11180 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_HOUR_SECOND; } break; case 1498: /* Line 1792 of yacc.c */ -#line 11176 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11181 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; } break; case 1499: /* Line 1792 of yacc.c */ -#line 11177 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11182 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_MINUTE_SECOND; } break; case 1500: /* Line 1792 of yacc.c */ -#line 11178 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11183 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_SECOND_MICROSECOND; } break; case 1501: /* Line 1792 of yacc.c */ -#line 11179 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11184 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval)=INTERVAL_YEAR_MONTH; } break; case 1502: /* Line 1792 of yacc.c */ -#line 11183 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11188 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_DAY; } break; case 1503: /* Line 1792 of yacc.c */ -#line 11184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_WEEK; } break; case 1504: /* Line 1792 of yacc.c */ -#line 11185 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11190 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_HOUR; } break; case 1505: /* Line 1792 of yacc.c */ -#line 11186 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11191 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_MINUTE; } break; case 1506: /* Line 1792 of yacc.c */ -#line 11187 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11192 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_MONTH; } break; case 1507: /* Line 1792 of yacc.c */ -#line 11188 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11193 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_QUARTER; } break; case 1508: /* Line 1792 of yacc.c */ -#line 11189 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11194 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_SECOND; } break; case 1509: /* Line 1792 of yacc.c */ -#line 11190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_MICROSECOND; } break; case 1510: /* Line 1792 of yacc.c */ -#line 11191 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11196 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.interval_time_st)=INTERVAL_YEAR; } break; case 1511: /* Line 1792 of yacc.c */ -#line 11195 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11200 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATE; } break; case 1512: /* Line 1792 of yacc.c */ -#line 11196 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11201 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.date_time_type)= MYSQL_TIMESTAMP_TIME; } break; case 1513: /* Line 1792 of yacc.c */ -#line 11197 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11202 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; } break; case 1514: /* Line 1792 of yacc.c */ -#line 11198 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11203 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.date_time_type)= MYSQL_TIMESTAMP_DATETIME; } break; case 1518: /* Line 1792 of yacc.c */ -#line 11208 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11213 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str_ptr)=0; } break; case 1519: /* Line 1792 of yacc.c */ -#line 11210 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11215 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str_ptr)= (LEX_STRING*) sql_memdup(&(yyvsp[(2) - (2)].lex_str),sizeof(LEX_STRING)); if ((yyval.lex_str_ptr) == NULL) @@ -30924,13 +30929,13 @@ case 1522: /* Line 1792 of yacc.c */ -#line 11223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->where= 0; } break; case 1523: /* Line 1792 of yacc.c */ -#line 11225 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11230 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= IN_WHERE; } @@ -30938,7 +30943,7 @@ case 1524: /* Line 1792 of yacc.c */ -#line 11229 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11234 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *select= Select; select->where= (yyvsp[(3) - (3)].item); @@ -30950,7 +30955,7 @@ case 1526: /* Line 1792 of yacc.c */ -#line 11241 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11246 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= IN_HAVING; } @@ -30958,7 +30963,7 @@ case 1527: /* Line 1792 of yacc.c */ -#line 11245 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11250 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->having= (yyvsp[(3) - (3)].item); @@ -30970,7 +30975,7 @@ case 1528: /* Line 1792 of yacc.c */ -#line 11256 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11261 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->escape_used= TRUE; (yyval.item)= (yyvsp[(2) - (2)].item); @@ -30979,7 +30984,7 @@ case 1529: /* Line 1792 of yacc.c */ -#line 11261 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11266 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; Lex->escape_used= FALSE; @@ -30993,25 +30998,25 @@ case 1532: /* Line 1792 of yacc.c */ -#line 11283 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11288 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_group_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; } break; case 1533: /* Line 1792 of yacc.c */ -#line 11285 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11290 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_group_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; } break; case 1534: /* Line 1792 of yacc.c */ -#line 11289 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11294 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1535: /* Line 1792 of yacc.c */ -#line 11291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11296 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* 'WITH CUBE' is reserved in the MySQL syntax, but not implemented, @@ -31035,7 +31040,7 @@ case 1536: /* Line 1792 of yacc.c */ -#line 11311 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11316 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* 'WITH ROLLUP' is needed for backward compatibility, @@ -31063,7 +31068,7 @@ case 1540: /* Line 1792 of yacc.c */ -#line 11351 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11356 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; bool ascending= ((yyvsp[(2) - (2)].num) == 1) ? true : false; @@ -31074,7 +31079,7 @@ case 1543: /* Line 1792 of yacc.c */ -#line 11370 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11375 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; SELECT_LEX *sel= lex->current_select; @@ -31109,37 +31114,37 @@ case 1545: /* Line 1792 of yacc.c */ -#line 11405 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11410 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_order_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; } break; case 1546: /* Line 1792 of yacc.c */ -#line 11407 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11412 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_order_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; } break; case 1547: /* Line 1792 of yacc.c */ -#line 11411 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11416 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) = 1; } break; case 1548: /* Line 1792 of yacc.c */ -#line 11412 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11417 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) =1; } break; case 1549: /* Line 1792 of yacc.c */ -#line 11413 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11418 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num) =0; } break; case 1550: /* Line 1792 of yacc.c */ -#line 11418 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11423 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -31150,25 +31155,25 @@ case 1551: /* Line 1792 of yacc.c */ -#line 11424 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11429 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1552: /* Line 1792 of yacc.c */ -#line 11428 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11433 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1553: /* Line 1792 of yacc.c */ -#line 11429 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11434 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1554: /* Line 1792 of yacc.c */ -#line 11434 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11439 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT); } @@ -31176,7 +31181,7 @@ case 1555: /* Line 1792 of yacc.c */ -#line 11441 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11446 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->select_limit= (yyvsp[(1) - (1)].item); @@ -31187,7 +31192,7 @@ case 1556: /* Line 1792 of yacc.c */ -#line 11448 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11453 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->select_limit= (yyvsp[(3) - (3)].item); @@ -31198,7 +31203,7 @@ case 1557: /* Line 1792 of yacc.c */ -#line 11455 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11460 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->select_limit= (yyvsp[(1) - (3)].item); @@ -31209,7 +31214,7 @@ case 1558: /* Line 1792 of yacc.c */ -#line 11465 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11470 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -31240,7 +31245,7 @@ case 1559: /* Line 1792 of yacc.c */ -#line 11492 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11497 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { ((Item_param *) (yyvsp[(1) - (1)].item))->limit_clause_param= TRUE; } @@ -31248,7 +31253,7 @@ case 1560: /* Line 1792 of yacc.c */ -#line 11496 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11501 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item) == NULL) @@ -31258,7 +31263,7 @@ case 1561: /* Line 1792 of yacc.c */ -#line 11502 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11507 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item) == NULL) @@ -31268,7 +31273,7 @@ case 1562: /* Line 1792 of yacc.c */ -#line 11508 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11513 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item) == NULL) @@ -31278,7 +31283,7 @@ case 1563: /* Line 1792 of yacc.c */ -#line 11517 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11522 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->current_select->select_limit= 0; @@ -31287,7 +31292,7 @@ case 1564: /* Line 1792 of yacc.c */ -#line 11522 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11527 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; sel->select_limit= (yyvsp[(2) - (2)].item); @@ -31298,133 +31303,133 @@ case 1565: /* Line 1792 of yacc.c */ -#line 11531 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11536 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1566: /* Line 1792 of yacc.c */ -#line 11532 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11537 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); } break; case 1567: /* Line 1792 of yacc.c */ -#line 11533 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11538 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1568: /* Line 1792 of yacc.c */ -#line 11534 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11539 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1569: /* Line 1792 of yacc.c */ -#line 11535 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11540 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1570: /* Line 1792 of yacc.c */ -#line 11536 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11541 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1571: /* Line 1792 of yacc.c */ -#line 11540 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11545 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1572: /* Line 1792 of yacc.c */ -#line 11541 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11546 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); } break; case 1573: /* Line 1792 of yacc.c */ -#line 11542 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11547 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1574: /* Line 1792 of yacc.c */ -#line 11543 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11548 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1575: /* Line 1792 of yacc.c */ -#line 11544 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11549 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT; } break; case 1576: /* Line 1792 of yacc.c */ -#line 11548 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11553 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1577: /* Line 1792 of yacc.c */ -#line 11549 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11554 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1578: /* Line 1792 of yacc.c */ -#line 11550 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11555 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1579: /* Line 1792 of yacc.c */ -#line 11551 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11556 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1580: /* Line 1792 of yacc.c */ -#line 11552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1581: /* Line 1792 of yacc.c */ -#line 11556 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11561 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1582: /* Line 1792 of yacc.c */ -#line 11557 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11562 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1583: /* Line 1792 of yacc.c */ -#line 11558 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11563 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); } break; case 1584: /* Line 1792 of yacc.c */ -#line 11559 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11564 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT; } break; case 1585: /* Line 1792 of yacc.c */ -#line 11564 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11569 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); } break; case 1589: /* Line 1792 of yacc.c */ -#line 11575 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11580 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -31458,13 +31463,13 @@ case 1591: /* Line 1792 of yacc.c */ -#line 11608 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11613 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1592: /* Line 1792 of yacc.c */ -#line 11610 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11615 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->proc_analyse->max_tree_elements= (yyvsp[(1) - (1)].ulonglong_number); } @@ -31472,7 +31477,7 @@ case 1593: /* Line 1792 of yacc.c */ -#line 11614 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11619 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->proc_analyse->max_tree_elements= (yyvsp[(1) - (3)].ulonglong_number); Lex->proc_analyse->max_treemem= (yyvsp[(3) - (3)].ulonglong_number); @@ -31481,7 +31486,7 @@ case 1594: /* Line 1792 of yacc.c */ -#line 11622 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11627 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); @@ -31495,7 +31500,7 @@ case 1595: /* Line 1792 of yacc.c */ -#line 11634 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11639 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->describe && (!(lex->result= new select_dumpvar()))) @@ -31505,19 +31510,19 @@ case 1596: /* Line 1792 of yacc.c */ -#line 11640 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11645 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1598: /* Line 1792 of yacc.c */ -#line 11645 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11650 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1599: /* Line 1792 of yacc.c */ -#line 11650 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11655 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->result) @@ -31540,7 +31545,7 @@ case 1600: /* Line 1792 of yacc.c */ -#line 11669 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11674 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; #ifndef DBUG_OFF @@ -31580,7 +31585,7 @@ case 1601: /* Line 1792 of yacc.c */ -#line 11708 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11713 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (! Lex->parsing_options.allows_select_into) { @@ -31592,7 +31597,7 @@ case 1603: /* Line 1792 of yacc.c */ -#line 11720 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11725 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->uncacheable(UNCACHEABLE_SIDEEFFECT); @@ -31604,13 +31609,13 @@ case 1604: /* Line 1792 of yacc.c */ -#line 11728 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11733 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->exchange->cs= (yyvsp[(4) - (4)].charset); } break; case 1606: /* Line 1792 of yacc.c */ -#line 11731 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11736 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->describe) @@ -31626,7 +31631,7 @@ case 1607: /* Line 1792 of yacc.c */ -#line 11743 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11748 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); } @@ -31634,7 +31639,7 @@ case 1608: /* Line 1792 of yacc.c */ -#line 11754 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11759 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_DO; @@ -31644,7 +31649,7 @@ case 1609: /* Line 1792 of yacc.c */ -#line 11760 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11765 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->insert_list= (yyvsp[(3) - (3)].item_list); } @@ -31652,7 +31657,7 @@ case 1610: /* Line 1792 of yacc.c */ -#line 11771 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11776 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_DROP_TABLE; @@ -31665,19 +31670,19 @@ case 1611: /* Line 1792 of yacc.c */ -#line 11780 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11785 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1612: /* Line 1792 of yacc.c */ -#line 11781 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11786 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1613: /* Line 1792 of yacc.c */ -#line 11782 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11787 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (6)].lex_str).str); @@ -31697,13 +31702,13 @@ case 1614: /* Line 1792 of yacc.c */ -#line 11797 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11802 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1615: /* Line 1792 of yacc.c */ -#line 11799 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11804 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_DROP_DB; @@ -31714,7 +31719,7 @@ case 1616: /* Line 1792 of yacc.c */ -#line 11806 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11811 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -31739,7 +31744,7 @@ case 1617: /* Line 1792 of yacc.c */ -#line 11827 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11832 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -31764,7 +31769,7 @@ case 1618: /* Line 1792 of yacc.c */ -#line 11848 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11853 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->sphead) @@ -31780,7 +31785,7 @@ case 1619: /* Line 1792 of yacc.c */ -#line 11860 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11865 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_DROP_USER; } @@ -31788,7 +31793,7 @@ case 1620: /* Line 1792 of yacc.c */ -#line 11864 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11869 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_DROP_VIEW; @@ -31800,13 +31805,13 @@ case 1621: /* Line 1792 of yacc.c */ -#line 11872 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11877 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1622: /* Line 1792 of yacc.c */ -#line 11874 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11879 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->drop_if_exists= (yyvsp[(3) - (4)].num); Lex->spname= (yyvsp[(4) - (4)].spname); @@ -31816,7 +31821,7 @@ case 1623: /* Line 1792 of yacc.c */ -#line 11880 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11885 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_DROP_TRIGGER; @@ -31827,7 +31832,7 @@ case 1624: /* Line 1792 of yacc.c */ -#line 11887 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11892 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE; @@ -31836,7 +31841,7 @@ case 1625: /* Line 1792 of yacc.c */ -#line 11892 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11897 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP; @@ -31845,7 +31850,7 @@ case 1626: /* Line 1792 of yacc.c */ -#line 11897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_DROP_SERVER; Lex->drop_if_exists= (yyvsp[(3) - (4)].num); @@ -31856,7 +31861,7 @@ case 1629: /* Line 1792 of yacc.c */ -#line 11912 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11917 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL, TL_OPTION_UPDATING, @@ -31868,7 +31873,7 @@ case 1630: /* Line 1792 of yacc.c */ -#line 11923 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11928 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL, TL_OPTION_UPDATING, @@ -31882,7 +31887,7 @@ case 1633: /* Line 1792 of yacc.c */ -#line 11941 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11946 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL, TL_OPTION_UPDATING | TL_OPTION_ALIAS, @@ -31894,31 +31899,31 @@ case 1634: /* Line 1792 of yacc.c */ -#line 11951 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11956 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 1635: /* Line 1792 of yacc.c */ -#line 11952 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11957 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 1636: /* Line 1792 of yacc.c */ -#line 11956 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11961 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 1637: /* Line 1792 of yacc.c */ -#line 11957 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11962 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 1645: /* Line 1792 of yacc.c */ -#line 11980 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11985 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_INSERT; @@ -31929,7 +31934,7 @@ case 1646: /* Line 1792 of yacc.c */ -#line 11988 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11993 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_lock_for_tables((yyvsp[(3) - (5)].lock_type)); Lex->current_select= &Lex->select_lex; @@ -31938,13 +31943,13 @@ case 1647: /* Line 1792 of yacc.c */ -#line 11993 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 11998 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1648: /* Line 1792 of yacc.c */ -#line 11998 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12003 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_REPLACE; @@ -31955,7 +31960,7 @@ case 1649: /* Line 1792 of yacc.c */ -#line 12005 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12010 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_lock_for_tables((yyvsp[(3) - (4)].lock_type)); Lex->current_select= &Lex->select_lex; @@ -31964,13 +31969,13 @@ case 1650: /* Line 1792 of yacc.c */ -#line 12010 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12015 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1651: /* Line 1792 of yacc.c */ -#line 12015 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12020 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_QUERY_CACHE /* @@ -31987,13 +31992,13 @@ case 1652: /* Line 1792 of yacc.c */ -#line 12027 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12032 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; } break; case 1653: /* Line 1792 of yacc.c */ -#line 12029 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12034 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - YYTHD->query()); @@ -32010,19 +32015,19 @@ case 1654: /* Line 1792 of yacc.c */ -#line 12041 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12046 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE; } break; case 1655: /* Line 1792 of yacc.c */ -#line 12045 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12050 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); } break; case 1656: /* Line 1792 of yacc.c */ -#line 12047 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12052 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() - YYTHD->query()); @@ -32039,19 +32044,19 @@ case 1657: /* Line 1792 of yacc.c */ -#line 12062 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12067 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1658: /* Line 1792 of yacc.c */ -#line 12063 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12068 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1659: /* Line 1792 of yacc.c */ -#line 12068 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12073 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->field_list.empty(); @@ -32062,25 +32067,25 @@ case 1660: /* Line 1792 of yacc.c */ -#line 12076 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12081 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1661: /* Line 1792 of yacc.c */ -#line 12077 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12082 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1662: /* Line 1792 of yacc.c */ -#line 12078 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12083 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1663: /* Line 1792 of yacc.c */ -#line 12080 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12085 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!(lex->insert_list = new List_item) || @@ -32091,55 +32096,55 @@ case 1665: /* Line 1792 of yacc.c */ -#line 12090 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12095 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); } break; case 1666: /* Line 1792 of yacc.c */ -#line 12091 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12096 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); } break; case 1667: /* Line 1792 of yacc.c */ -#line 12095 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12100 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1668: /* Line 1792 of yacc.c */ -#line 12096 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12101 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1669: /* Line 1792 of yacc.c */ -#line 12098 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12103 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_braces(0);} break; case 1670: /* Line 1792 of yacc.c */ -#line 12099 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12104 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1671: /* Line 1792 of yacc.c */ -#line 12101 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12106 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->set_braces(1);} break; case 1672: /* Line 1792 of yacc.c */ -#line 12102 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12107 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1677: /* Line 1792 of yacc.c */ -#line 12117 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12122 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->field_list.push_back((yyvsp[(1) - (3)].item)) || @@ -32150,31 +32155,31 @@ case 1678: /* Line 1792 of yacc.c */ -#line 12126 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12131 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1679: /* Line 1792 of yacc.c */ -#line 12127 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12132 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1680: /* Line 1792 of yacc.c */ -#line 12131 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12136 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1681: /* Line 1792 of yacc.c */ -#line 12132 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12137 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1682: /* Line 1792 of yacc.c */ -#line 12137 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12142 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!(Lex->insert_list = new List_item)) MYSQL_YYABORT; @@ -32183,7 +32188,7 @@ case 1683: /* Line 1792 of yacc.c */ -#line 12142 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12147 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->many_values.push_back(lex->insert_list)) @@ -32193,13 +32198,13 @@ case 1684: /* Line 1792 of yacc.c */ -#line 12150 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12155 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1686: /* Line 1792 of yacc.c */ -#line 12156 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12161 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->insert_list->push_back((yyvsp[(3) - (3)].item))) MYSQL_YYABORT; @@ -32208,7 +32213,7 @@ case 1687: /* Line 1792 of yacc.c */ -#line 12161 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12166 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->insert_list->push_back((yyvsp[(1) - (1)].item))) MYSQL_YYABORT; @@ -32217,13 +32222,13 @@ case 1688: /* Line 1792 of yacc.c */ -#line 12168 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12173 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item);} break; case 1689: /* Line 1792 of yacc.c */ -#line 12170 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_default_value(Lex->current_context()); if ((yyval.item) == NULL) @@ -32233,13 +32238,13 @@ case 1691: /* Line 1792 of yacc.c */ -#line 12179 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12184 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->duplicates= DUP_UPDATE; } break; case 1693: /* Line 1792 of yacc.c */ -#line 12187 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12192 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; mysql_init_select(lex); @@ -32250,7 +32255,7 @@ case 1694: /* Line 1792 of yacc.c */ -#line 12195 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12200 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->select_lex.table_list.elements > 1) @@ -32273,13 +32278,13 @@ case 1695: /* Line 1792 of yacc.c */ -#line 12213 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12218 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1698: /* Line 1792 of yacc.c */ -#line 12223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_item_to_list(YYTHD, (yyvsp[(1) - (3)].item)) || add_value_to_list(YYTHD, (yyvsp[(3) - (3)].item))) MYSQL_YYABORT; @@ -32288,7 +32293,7 @@ case 1701: /* Line 1792 of yacc.c */ -#line 12236 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12241 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->update_list.push_back((yyvsp[(1) - (3)].item)) || @@ -32299,19 +32304,19 @@ case 1702: /* Line 1792 of yacc.c */ -#line 12245 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12250 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE_DEFAULT; } break; case 1703: /* Line 1792 of yacc.c */ -#line 12246 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12251 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; } break; case 1704: /* Line 1792 of yacc.c */ -#line 12253 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12258 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_DELETE; @@ -32326,7 +32331,7 @@ case 1706: /* Line 1792 of yacc.c */ -#line 12268 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12273 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!Select->add_table_to_list(YYTHD, (yyvsp[(2) - (3)].table), NULL, TL_OPTION_UPDATING, YYPS->m_lock_type, @@ -32341,13 +32346,13 @@ case 1707: /* Line 1792 of yacc.c */ -#line 12279 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12284 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1708: /* Line 1792 of yacc.c */ -#line 12281 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12286 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { mysql_init_multi_delete(Lex); YYPS->m_lock_type= TL_READ_DEFAULT; @@ -32357,7 +32362,7 @@ case 1709: /* Line 1792 of yacc.c */ -#line 12287 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12292 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (multi_delete_set_locks_and_link_aux_tables(Lex)) MYSQL_YYABORT; @@ -32366,7 +32371,7 @@ case 1710: /* Line 1792 of yacc.c */ -#line 12292 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12297 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { mysql_init_multi_delete(Lex); YYPS->m_lock_type= TL_READ_DEFAULT; @@ -32376,7 +32381,7 @@ case 1711: /* Line 1792 of yacc.c */ -#line 12298 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12303 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (multi_delete_set_locks_and_link_aux_tables(Lex)) MYSQL_YYABORT; @@ -32385,7 +32390,7 @@ case 1714: /* Line 1792 of yacc.c */ -#line 12311 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12316 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Table_ident *ti= new Table_ident((yyvsp[(1) - (2)].lex_str)); if (ti == NULL) @@ -32402,7 +32407,7 @@ case 1715: /* Line 1792 of yacc.c */ -#line 12324 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12329 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Table_ident *ti= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str), (yyvsp[(3) - (4)].lex_str), 0); if (ti == NULL) @@ -32419,49 +32424,49 @@ case 1716: /* Line 1792 of yacc.c */ -#line 12339 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1717: /* Line 1792 of yacc.c */ -#line 12340 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12345 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1718: /* Line 1792 of yacc.c */ -#line 12344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1719: /* Line 1792 of yacc.c */ -#line 12345 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12350 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1720: /* Line 1792 of yacc.c */ -#line 12349 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12354 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= OPTION_QUICK; } break; case 1721: /* Line 1792 of yacc.c */ -#line 12350 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12355 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; } break; case 1722: /* Line 1792 of yacc.c */ -#line 12351 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12356 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ignore= 1; } break; case 1723: /* Line 1792 of yacc.c */ -#line 12356 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12361 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX* lex= Lex; lex->sql_command= SQLCOM_TRUNCATE; @@ -32476,7 +32481,7 @@ case 1724: /* Line 1792 of yacc.c */ -#line 12367 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12372 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX* lex= thd->lex; @@ -32489,7 +32494,7 @@ case 1731: /* Line 1792 of yacc.c */ -#line 12392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_CPU; } @@ -32497,7 +32502,7 @@ case 1732: /* Line 1792 of yacc.c */ -#line 12396 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12401 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_MEMORY; } @@ -32505,7 +32510,7 @@ case 1733: /* Line 1792 of yacc.c */ -#line 12400 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12405 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_BLOCK_IO; } @@ -32513,7 +32518,7 @@ case 1734: /* Line 1792 of yacc.c */ -#line 12404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_CONTEXT; } @@ -32521,7 +32526,7 @@ case 1735: /* Line 1792 of yacc.c */ -#line 12408 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12413 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_PAGE_FAULTS; } @@ -32529,7 +32534,7 @@ case 1736: /* Line 1792 of yacc.c */ -#line 12412 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12417 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_IPC; } @@ -32537,7 +32542,7 @@ case 1737: /* Line 1792 of yacc.c */ -#line 12416 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12421 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_SWAPS; } @@ -32545,7 +32550,7 @@ case 1738: /* Line 1792 of yacc.c */ -#line 12420 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12425 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_SOURCE; } @@ -32553,7 +32558,7 @@ case 1739: /* Line 1792 of yacc.c */ -#line 12424 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12429 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_options|= PROFILE_ALL; } @@ -32561,7 +32566,7 @@ case 1740: /* Line 1792 of yacc.c */ -#line 12431 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12436 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_query_id= 0; } @@ -32569,7 +32574,7 @@ case 1741: /* Line 1792 of yacc.c */ -#line 12435 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12440 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->profile_query_id= atoi((yyvsp[(3) - (3)].lex_str).str); } @@ -32577,7 +32582,7 @@ case 1742: /* Line 1792 of yacc.c */ -#line 12444 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12449 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->wild=0; @@ -32589,7 +32594,7 @@ case 1743: /* Line 1792 of yacc.c */ -#line 12452 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12457 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -32597,7 +32602,7 @@ case 1744: /* Line 1792 of yacc.c */ -#line 12459 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12464 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_DATABASES; @@ -32608,7 +32613,7 @@ case 1745: /* Line 1792 of yacc.c */ -#line 12466 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12471 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLES; @@ -32620,7 +32625,7 @@ case 1746: /* Line 1792 of yacc.c */ -#line 12474 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12479 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TRIGGERS; @@ -32632,7 +32637,7 @@ case 1747: /* Line 1792 of yacc.c */ -#line 12482 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12487 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_EVENTS; @@ -32644,7 +32649,7 @@ case 1748: /* Line 1792 of yacc.c */ -#line 12490 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12495 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; @@ -32656,7 +32661,7 @@ case 1749: /* Line 1792 of yacc.c */ -#line 12498 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12503 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; @@ -32668,7 +32673,7 @@ case 1750: /* Line 1792 of yacc.c */ -#line 12506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_PLUGINS; @@ -32679,19 +32684,19 @@ case 1751: /* Line 1792 of yacc.c */ -#line 12513 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12518 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.db_type= (yyvsp[(2) - (3)].db_type); } break; case 1752: /* Line 1792 of yacc.c */ -#line 12515 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12520 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_info.db_type= NULL; } break; case 1753: /* Line 1792 of yacc.c */ -#line 12517 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12522 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_FIELDS; @@ -32704,7 +32709,7 @@ case 1754: /* Line 1792 of yacc.c */ -#line 12526 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12531 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_BINLOGS; } @@ -32712,7 +32717,7 @@ case 1755: /* Line 1792 of yacc.c */ -#line 12530 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12535 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS; } @@ -32720,7 +32725,7 @@ case 1756: /* Line 1792 of yacc.c */ -#line 12534 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12539 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS; @@ -32729,7 +32734,7 @@ case 1758: /* Line 1792 of yacc.c */ -#line 12539 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12544 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS; @@ -32738,7 +32743,7 @@ case 1760: /* Line 1792 of yacc.c */ -#line 12544 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12549 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_KEYS; @@ -32751,7 +32756,7 @@ case 1761: /* Line 1792 of yacc.c */ -#line 12553 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12558 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; @@ -32762,7 +32767,7 @@ case 1762: /* Line 1792 of yacc.c */ -#line 12560 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12565 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_SHOW_PRIVILEGES; @@ -32771,31 +32776,31 @@ case 1763: /* Line 1792 of yacc.c */ -#line 12565 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12570 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (void) create_select_for_variable("warning_count"); } break; case 1764: /* Line 1792 of yacc.c */ -#line 12567 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12572 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (void) create_select_for_variable("error_count"); } break; case 1765: /* Line 1792 of yacc.c */ -#line 12569 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12574 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_WARNS;} break; case 1766: /* Line 1792 of yacc.c */ -#line 12571 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12576 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_ERRORS;} break; case 1767: /* Line 1792 of yacc.c */ -#line 12573 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12578 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN, ER_WARN_DEPRECATED_SYNTAX, @@ -32807,7 +32812,7 @@ case 1768: /* Line 1792 of yacc.c */ -#line 12581 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12586 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN, ER_WARN_DEPRECATED_SYNTAX, @@ -32822,7 +32827,7 @@ case 1769: /* Line 1792 of yacc.c */ -#line 12592 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12597 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS; @@ -32834,13 +32839,13 @@ case 1770: /* Line 1792 of yacc.c */ -#line 12600 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12605 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;} break; case 1771: /* Line 1792 of yacc.c */ -#line 12602 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12607 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_VARIABLES; @@ -32852,7 +32857,7 @@ case 1772: /* Line 1792 of yacc.c */ -#line 12610 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12615 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_CHARSETS; @@ -32863,7 +32868,7 @@ case 1773: /* Line 1792 of yacc.c */ -#line 12617 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12622 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_COLLATIONS; @@ -32874,7 +32879,7 @@ case 1774: /* Line 1792 of yacc.c */ -#line 12624 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12629 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_SHOW_GRANTS; @@ -32888,7 +32893,7 @@ case 1775: /* Line 1792 of yacc.c */ -#line 12634 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12639 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_SHOW_GRANTS; @@ -32899,7 +32904,7 @@ case 1776: /* Line 1792 of yacc.c */ -#line 12641 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12646 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command=SQLCOM_SHOW_CREATE_DB; Lex->create_info.options=(yyvsp[(3) - (4)].num); @@ -32909,7 +32914,7 @@ case 1777: /* Line 1792 of yacc.c */ -#line 12647 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12652 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -32922,7 +32927,7 @@ case 1778: /* Line 1792 of yacc.c */ -#line 12656 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12661 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command = SQLCOM_SHOW_CREATE; @@ -32934,7 +32939,7 @@ case 1779: /* Line 1792 of yacc.c */ -#line 12664 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12669 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_MASTER_STAT; } @@ -32942,7 +32947,7 @@ case 1780: /* Line 1792 of yacc.c */ -#line 12668 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12673 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; } @@ -32950,7 +32955,7 @@ case 1781: /* Line 1792 of yacc.c */ -#line 12672 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12677 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -32961,7 +32966,7 @@ case 1782: /* Line 1792 of yacc.c */ -#line 12679 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12684 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -32972,7 +32977,7 @@ case 1783: /* Line 1792 of yacc.c */ -#line 12686 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12691 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER; @@ -32982,7 +32987,7 @@ case 1784: /* Line 1792 of yacc.c */ -#line 12692 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12697 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS_PROC; @@ -32993,7 +32998,7 @@ case 1785: /* Line 1792 of yacc.c */ -#line 12699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_SHOW_STATUS_FUNC; @@ -33004,7 +33009,7 @@ case 1786: /* Line 1792 of yacc.c */ -#line 12706 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12711 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_PROC_CODE; Lex->spname= (yyvsp[(3) - (3)].spname); @@ -33013,7 +33018,7 @@ case 1787: /* Line 1792 of yacc.c */ -#line 12711 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12716 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_FUNC_CODE; Lex->spname= (yyvsp[(3) - (3)].spname); @@ -33022,7 +33027,7 @@ case 1788: /* Line 1792 of yacc.c */ -#line 12716 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12721 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->spname= (yyvsp[(3) - (3)].spname); Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT; @@ -33031,73 +33036,73 @@ case 1789: /* Line 1792 of yacc.c */ -#line 12724 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12729 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; } break; case 1790: /* Line 1792 of yacc.c */ -#line 12726 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12731 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; } break; case 1791: /* Line 1792 of yacc.c */ -#line 12728 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12733 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; } break; case 1796: /* Line 1792 of yacc.c */ -#line 12742 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12747 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.simple_string)= 0; } break; case 1797: /* Line 1792 of yacc.c */ -#line 12743 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12748 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; } break; case 1798: /* Line 1792 of yacc.c */ -#line 12747 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12752 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->verbose=0; } break; case 1799: /* Line 1792 of yacc.c */ -#line 12748 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12753 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->verbose=1; } break; case 1802: /* Line 1792 of yacc.c */ -#line 12757 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12762 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.log_file_name = 0; } break; case 1803: /* Line 1792 of yacc.c */ -#line 12758 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12763 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; } break; case 1804: /* Line 1792 of yacc.c */ -#line 12762 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12767 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.pos = 4; /* skip magic number */ } break; case 1805: /* Line 1792 of yacc.c */ -#line 12763 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12768 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); } break; case 1807: /* Line 1792 of yacc.c */ -#line 12769 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12774 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->wild= new (YYTHD->mem_root) String((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, system_charset_info); @@ -33108,7 +33113,7 @@ case 1808: /* Line 1792 of yacc.c */ -#line 12776 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12781 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->where= (yyvsp[(2) - (2)].item); if ((yyvsp[(2) - (2)].item)) @@ -33118,7 +33123,7 @@ case 1809: /* Line 1792 of yacc.c */ -#line 12786 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12791 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; mysql_init_select(lex); @@ -33133,7 +33138,7 @@ case 1810: /* Line 1792 of yacc.c */ -#line 12797 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12802 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->parsing_place= NO_MATTER; } @@ -33141,19 +33146,19 @@ case 1811: /* Line 1792 of yacc.c */ -#line 12801 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12806 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->describe|= DESCRIBE_NORMAL; } break; case 1812: /* Line 1792 of yacc.c */ -#line 12803 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12808 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->select_lex.options|= SELECT_DESCRIBE; } break; case 1820: /* Line 1792 of yacc.c */ -#line 12821 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12826 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((Lex->explain_format= new Explain_format_traditional) == NULL) MYSQL_YYABORT; @@ -33162,7 +33167,7 @@ case 1821: /* Line 1792 of yacc.c */ -#line 12826 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12831 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((Lex->explain_format= new Explain_format_traditional) == NULL) MYSQL_YYABORT; @@ -33172,7 +33177,7 @@ case 1822: /* Line 1792 of yacc.c */ -#line 12832 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12837 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((Lex->explain_format= new Explain_format_traditional) == NULL) MYSQL_YYABORT; @@ -33182,7 +33187,7 @@ case 1823: /* Line 1792 of yacc.c */ -#line 12838 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12843 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!my_strcasecmp(system_charset_info, (yyvsp[(3) - (3)].lex_str).str, "JSON")) { @@ -33205,19 +33210,19 @@ case 1824: /* Line 1792 of yacc.c */ -#line 12859 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12864 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1825: /* Line 1792 of yacc.c */ -#line 12860 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12865 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->wild= (yyvsp[(1) - (1)].string); } break; case 1826: /* Line 1792 of yacc.c */ -#line 12862 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12867 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->wild= new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length, @@ -33229,7 +33234,7 @@ case 1827: /* Line 1792 of yacc.c */ -#line 12876 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12881 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_FLUSH; @@ -33240,13 +33245,13 @@ case 1828: /* Line 1792 of yacc.c */ -#line 12883 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12888 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1829: /* Line 1792 of yacc.c */ -#line 12888 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12893 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_TABLES; /* @@ -33260,25 +33265,25 @@ case 1830: /* Line 1792 of yacc.c */ -#line 12897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1831: /* Line 1792 of yacc.c */ -#line 12898 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12903 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1833: /* Line 1792 of yacc.c */ -#line 12903 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12908 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1834: /* Line 1792 of yacc.c */ -#line 12905 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12910 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { TABLE_LIST *tables= Lex->query_tables; Lex->type|= REFRESH_READ_LOCK; @@ -33293,7 +33298,7 @@ case 1835: /* Line 1792 of yacc.c */ -#line 12916 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12921 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->query_tables == NULL) // Table list can't be empty { @@ -33305,7 +33310,7 @@ case 1836: /* Line 1792 of yacc.c */ -#line 12924 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12929 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { TABLE_LIST *tables= Lex->query_tables; Lex->type|= REFRESH_FOR_EXPORT; @@ -33320,103 +33325,103 @@ case 1838: /* Line 1792 of yacc.c */ -#line 12939 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12944 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1839: /* Line 1792 of yacc.c */ -#line 12944 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12949 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_ERROR_LOG; } break; case 1840: /* Line 1792 of yacc.c */ -#line 12946 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12951 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_ENGINE_LOG; } break; case 1841: /* Line 1792 of yacc.c */ -#line 12948 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12953 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_GENERAL_LOG; } break; case 1842: /* Line 1792 of yacc.c */ -#line 12950 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12955 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_SLOW_LOG; } break; case 1843: /* Line 1792 of yacc.c */ -#line 12952 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12957 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_BINARY_LOG; } break; case 1844: /* Line 1792 of yacc.c */ -#line 12954 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12959 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_RELAY_LOG; } break; case 1845: /* Line 1792 of yacc.c */ -#line 12956 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12961 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_QUERY_CACHE_FREE; } break; case 1846: /* Line 1792 of yacc.c */ -#line 12958 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12963 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_HOSTS; } break; case 1847: /* Line 1792 of yacc.c */ -#line 12960 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12965 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_GRANT; } break; case 1848: /* Line 1792 of yacc.c */ -#line 12962 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12967 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_LOG; } break; case 1849: /* Line 1792 of yacc.c */ -#line 12964 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12969 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_STATUS; } break; case 1850: /* Line 1792 of yacc.c */ -#line 12966 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12971 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_DES_KEY_FILE; } break; case 1851: /* Line 1792 of yacc.c */ -#line 12968 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12973 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_USER_RESOURCES; } break; case 1852: /* Line 1792 of yacc.c */ -#line 12972 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12977 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1853: /* Line 1792 of yacc.c */ -#line 12973 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12978 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1854: /* Line 1792 of yacc.c */ -#line 12978 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12983 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_RESET; lex->type=0; @@ -33425,49 +33430,49 @@ case 1855: /* Line 1792 of yacc.c */ -#line 12983 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12988 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1858: /* Line 1792 of yacc.c */ -#line 12992 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12997 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_SLAVE; } break; case 1859: /* Line 1792 of yacc.c */ -#line 12993 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12998 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 1860: /* Line 1792 of yacc.c */ -#line 12994 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 12999 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_MASTER; } break; case 1861: /* Line 1792 of yacc.c */ -#line 12995 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13000 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type|= REFRESH_QUERY_CACHE;} break; case 1862: /* Line 1792 of yacc.c */ -#line 12999 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13004 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->reset_slave_info.all= false; } break; case 1863: /* Line 1792 of yacc.c */ -#line 13000 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13005 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->reset_slave_info.all= true; } break; case 1864: /* Line 1792 of yacc.c */ -#line 13005 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13010 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->type=0; @@ -33477,13 +33482,13 @@ case 1865: /* Line 1792 of yacc.c */ -#line 13011 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13016 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1867: /* Line 1792 of yacc.c */ -#line 13020 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13025 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->to_log = (yyvsp[(2) - (2)].lex_str).str; } @@ -33491,7 +33496,7 @@ case 1868: /* Line 1792 of yacc.c */ -#line 13024 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13029 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->value_list.empty(); @@ -33502,7 +33507,7 @@ case 1869: /* Line 1792 of yacc.c */ -#line 13036 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13041 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->value_list.empty(); @@ -33513,25 +33518,25 @@ case 1870: /* Line 1792 of yacc.c */ -#line 13045 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13050 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type= 0; } break; case 1871: /* Line 1792 of yacc.c */ -#line 13046 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13051 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type= 0; } break; case 1872: /* Line 1792 of yacc.c */ -#line 13047 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13052 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->type= ONLY_KILL_QUERY; } break; case 1873: /* Line 1792 of yacc.c */ -#line 13054 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13059 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command=SQLCOM_CHANGE_DB; @@ -33541,7 +33546,7 @@ case 1874: /* Line 1792 of yacc.c */ -#line 13065 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13070 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -33557,7 +33562,7 @@ case 1875: /* Line 1792 of yacc.c */ -#line 13077 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13082 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_LOAD; @@ -33571,7 +33576,7 @@ case 1876: /* Line 1792 of yacc.c */ -#line 13087 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13092 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!Select->add_table_to_list(YYTHD, (yyvsp[(12) - (13)].table), NULL, TL_OPTION_UPDATING, @@ -33585,49 +33590,49 @@ case 1877: /* Line 1792 of yacc.c */ -#line 13097 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13102 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->exchange->cs= (yyvsp[(15) - (15)].charset); } break; case 1878: /* Line 1792 of yacc.c */ -#line 13101 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13106 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1879: /* Line 1792 of yacc.c */ -#line 13105 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13110 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.filetype)= FILETYPE_CSV; } break; case 1880: /* Line 1792 of yacc.c */ -#line 13106 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13111 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.filetype)= FILETYPE_XML; } break; case 1881: /* Line 1792 of yacc.c */ -#line 13110 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13115 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=0;} break; case 1882: /* Line 1792 of yacc.c */ -#line 13111 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13116 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=1;} break; case 1883: /* Line 1792 of yacc.c */ -#line 13115 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13120 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE_DEFAULT; } break; case 1884: /* Line 1792 of yacc.c */ -#line 13117 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13122 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { #ifdef HAVE_QUERY_CACHE /* @@ -33643,31 +33648,31 @@ case 1885: /* Line 1792 of yacc.c */ -#line 13128 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13133 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; } break; case 1886: /* Line 1792 of yacc.c */ -#line 13132 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13137 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->duplicates=DUP_ERROR; } break; case 1887: /* Line 1792 of yacc.c */ -#line 13133 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13138 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->duplicates=DUP_REPLACE; } break; case 1888: /* Line 1792 of yacc.c */ -#line 13134 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13139 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ignore= 1; } break; case 1893: /* Line 1792 of yacc.c */ -#line 13149 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13154 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->field_term= (yyvsp[(3) - (3)].string); @@ -33676,7 +33681,7 @@ case 1894: /* Line 1792 of yacc.c */ -#line 13154 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13159 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; DBUG_ASSERT(lex->exchange != 0); @@ -33687,7 +33692,7 @@ case 1895: /* Line 1792 of yacc.c */ -#line 13161 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13166 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->enclosed= (yyvsp[(3) - (3)].string); @@ -33696,7 +33701,7 @@ case 1896: /* Line 1792 of yacc.c */ -#line 13166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->escaped= (yyvsp[(3) - (3)].string); @@ -33705,7 +33710,7 @@ case 1901: /* Line 1792 of yacc.c */ -#line 13184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->line_term= (yyvsp[(3) - (3)].string); @@ -33714,7 +33719,7 @@ case 1902: /* Line 1792 of yacc.c */ -#line 13189 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13194 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->line_start= (yyvsp[(3) - (3)].string); @@ -33723,19 +33728,19 @@ case 1903: /* Line 1792 of yacc.c */ -#line 13196 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13201 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 1904: /* Line 1792 of yacc.c */ -#line 13198 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13203 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->exchange->line_term = (yyvsp[(4) - (4)].string); } break; case 1906: /* Line 1792 of yacc.c */ -#line 13203 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13208 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { DBUG_ASSERT(Lex->exchange != 0); Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str); @@ -33744,55 +33749,55 @@ case 1907: /* Line 1792 of yacc.c */ -#line 13210 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13215 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 1908: /* Line 1792 of yacc.c */ -#line 13212 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13217 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { } break; case 1909: /* Line 1792 of yacc.c */ -#line 13216 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1910: /* Line 1792 of yacc.c */ -#line 13217 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13222 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1911: /* Line 1792 of yacc.c */ -#line 13218 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13223 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1912: /* Line 1792 of yacc.c */ -#line 13223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); } break; case 1913: /* Line 1792 of yacc.c */ -#line 13225 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13230 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); } break; case 1914: /* Line 1792 of yacc.c */ -#line 13229 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13234 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {(yyval.item)= (yyvsp[(1) - (1)].item);} break; case 1915: /* Line 1792 of yacc.c */ -#line 13231 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13236 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_user_var_as_out_param((yyvsp[(2) - (2)].lex_str)); if ((yyval.item) == NULL) @@ -33802,19 +33807,19 @@ case 1916: /* Line 1792 of yacc.c */ -#line 13239 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13244 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1917: /* Line 1792 of yacc.c */ -#line 13240 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13245 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1920: /* Line 1792 of yacc.c */ -#line 13250 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13255 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; uint length= (uint) ((yyvsp[(5) - (5)].simple_string) - (yyvsp[(3) - (5)].simple_string)); @@ -33833,7 +33838,7 @@ case 1921: /* Line 1792 of yacc.c */ -#line 13270 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13275 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX_STRING tmp; THD *thd= YYTHD; @@ -33861,7 +33866,7 @@ case 1922: /* Line 1792 of yacc.c */ -#line 13294 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13299 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { uint repertoire= Lex->text_string_is_7bit ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; @@ -33877,7 +33882,7 @@ case 1923: /* Line 1792 of yacc.c */ -#line 13306 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13311 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_string *str= new (YYTHD->mem_root) Item_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, (yyvsp[(1) - (2)].charset)); @@ -33892,7 +33897,7 @@ case 1924: /* Line 1792 of yacc.c */ -#line 13317 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13322 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_string* item= (Item_string*) (yyvsp[(1) - (2)].item); item->append((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length); @@ -33912,7 +33917,7 @@ case 1925: /* Line 1792 of yacc.c */ -#line 13336 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13341 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.string)= new (YYTHD->mem_root) String((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length, @@ -33924,7 +33929,7 @@ case 1926: /* Line 1792 of yacc.c */ -#line 13344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if (tmp == NULL) @@ -33940,7 +33945,7 @@ case 1927: /* Line 1792 of yacc.c */ -#line 13356 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13361 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if (tmp == NULL) @@ -33956,7 +33961,7 @@ case 1928: /* Line 1792 of yacc.c */ -#line 13371 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13376 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -33978,19 +33983,19 @@ case 1929: /* Line 1792 of yacc.c */ -#line 13391 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13396 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = (yyvsp[(1) - (1)].item); } break; case 1930: /* Line 1792 of yacc.c */ -#line 13392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = (yyvsp[(2) - (2)].item_num); } break; case 1931: /* Line 1792 of yacc.c */ -#line 13394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13399 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyvsp[(2) - (2)].item_num)->max_length++; (yyval.item)= (yyvsp[(2) - (2)].item_num)->neg(); @@ -33999,25 +34004,25 @@ case 1932: /* Line 1792 of yacc.c */ -#line 13402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = (yyvsp[(1) - (1)].item); } break; case 1933: /* Line 1792 of yacc.c */ -#line 13403 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13408 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = (yyvsp[(1) - (1)].item_num); } break; case 1934: /* Line 1792 of yacc.c */ -#line 13404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 1935: /* Line 1792 of yacc.c */ -#line 13406 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13411 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex_input_stream *lip= YYLIP; /* @@ -34036,7 +34041,7 @@ case 1936: /* Line 1792 of yacc.c */ -#line 13421 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13426 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_int(NAME_STRING("FALSE"), 0, 1); if ((yyval.item) == NULL) @@ -34046,7 +34051,7 @@ case 1937: /* Line 1792 of yacc.c */ -#line 13427 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13432 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_int(NAME_STRING("TRUE"), 1, 1); if ((yyval.item) == NULL) @@ -34056,7 +34061,7 @@ case 1938: /* Line 1792 of yacc.c */ -#line 13433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item) = new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item) == NULL) @@ -34066,7 +34071,7 @@ case 1939: /* Line 1792 of yacc.c */ -#line 13439 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13444 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item) == NULL) @@ -34076,7 +34081,7 @@ case 1940: /* Line 1792 of yacc.c */ -#line 13445 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13450 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length); if (tmp == NULL) @@ -34111,7 +34116,7 @@ case 1941: /* Line 1792 of yacc.c */ -#line 13476 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13481 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length); if (tmp == NULL) @@ -34145,7 +34150,7 @@ case 1942: /* Line 1792 of yacc.c */ -#line 13509 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13514 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.item_num)= new (YYTHD->mem_root) @@ -34159,7 +34164,7 @@ case 1943: /* Line 1792 of yacc.c */ -#line 13519 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13524 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { int error; (yyval.item_num)= new (YYTHD->mem_root) @@ -34173,7 +34178,7 @@ case 1944: /* Line 1792 of yacc.c */ -#line 13529 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13534 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_num)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if ((yyval.item_num) == NULL) @@ -34183,7 +34188,7 @@ case 1945: /* Line 1792 of yacc.c */ -#line 13535 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13540 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_num)= new (YYTHD->mem_root) Item_decimal((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length, YYTHD->charset()); @@ -34196,7 +34201,7 @@ case 1946: /* Line 1792 of yacc.c */ -#line 13544 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13549 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item_num)= new (YYTHD->mem_root) Item_float((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); if (((yyval.item_num) == NULL) || (YYTHD->is_error())) @@ -34208,7 +34213,7 @@ case 1947: /* Line 1792 of yacc.c */ -#line 13556 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13561 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL, MYSQL_TYPE_DATE, true))) @@ -34218,7 +34223,7 @@ case 1948: /* Line 1792 of yacc.c */ -#line 13562 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13567 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL, MYSQL_TYPE_TIME, true))) @@ -34228,7 +34233,7 @@ case 1949: /* Line 1792 of yacc.c */ -#line 13568 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13573 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.item)= create_temporal_literal(YYTHD, (yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length, YYCSCL, MYSQL_TYPE_DATETIME, true))) @@ -34238,19 +34243,19 @@ case 1950: /* Line 1792 of yacc.c */ -#line 13583 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13588 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=(yyvsp[(1) - (1)].item); } break; case 1951: /* Line 1792 of yacc.c */ -#line 13584 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13589 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=(yyvsp[(1) - (1)].item); } break; case 1952: /* Line 1792 of yacc.c */ -#line 13589 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13594 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { SELECT_LEX *sel= Select; (yyval.item)= new (YYTHD->mem_root) Item_field(Lex->current_context(), @@ -34263,7 +34268,7 @@ case 1953: /* Line 1792 of yacc.c */ -#line 13598 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13603 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; SELECT_LEX *sel= Select; @@ -34280,13 +34285,13 @@ case 1954: /* Line 1792 of yacc.c */ -#line 13613 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13618 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=(yyvsp[(1) - (1)].item); } break; case 1955: /* Line 1792 of yacc.c */ -#line 13618 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13623 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -34341,13 +34346,13 @@ case 1956: /* Line 1792 of yacc.c */ -#line 13668 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13673 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 1957: /* Line 1792 of yacc.c */ -#line 13673 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13678 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; SELECT_LEX *sel=Select; @@ -34369,13 +34374,13 @@ case 1958: /* Line 1792 of yacc.c */ -#line 13690 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13695 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)= (yyvsp[(1) - (1)].item); } break; case 1959: /* Line 1792 of yacc.c */ -#line 13695 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13700 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -34459,7 +34464,7 @@ case 1960: /* Line 1792 of yacc.c */ -#line 13775 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13780 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -34488,7 +34493,7 @@ case 1961: /* Line 1792 of yacc.c */ -#line 13800 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13805 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -34520,13 +34525,13 @@ case 1962: /* Line 1792 of yacc.c */ -#line 13830 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13835 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);} break; case 1963: /* Line 1792 of yacc.c */ -#line 13832 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13837 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { TABLE_LIST *table= Select->table_list.first; if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (5)].lex_str).str, table->db)) @@ -34546,7 +34551,7 @@ case 1964: /* Line 1792 of yacc.c */ -#line 13848 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13853 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { TABLE_LIST *table= Select->table_list.first; if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (3)].lex_str).str, table->alias)) @@ -34560,13 +34565,13 @@ case 1965: /* Line 1792 of yacc.c */ -#line 13857 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13862 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);} break; case 1966: /* Line 1792 of yacc.c */ -#line 13862 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13867 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table)= new Table_ident((yyvsp[(1) - (1)].lex_str)); if ((yyval.table) == NULL) @@ -34576,7 +34581,7 @@ case 1967: /* Line 1792 of yacc.c */ -#line 13868 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13873 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (3)].lex_str),(yyvsp[(3) - (3)].lex_str),0); if ((yyval.table) == NULL) @@ -34586,7 +34591,7 @@ case 1968: /* Line 1792 of yacc.c */ -#line 13874 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13879 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* For Delphi */ (yyval.table)= new Table_ident((yyvsp[(2) - (2)].lex_str)); @@ -34597,7 +34602,7 @@ case 1969: /* Line 1792 of yacc.c */ -#line 13884 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13889 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table)= new Table_ident((yyvsp[(1) - (2)].lex_str)); if ((yyval.table) == NULL) @@ -34607,7 +34612,7 @@ case 1970: /* Line 1792 of yacc.c */ -#line 13890 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13895 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str),(yyvsp[(3) - (4)].lex_str),0); if ((yyval.table) == NULL) @@ -34617,7 +34622,7 @@ case 1971: /* Line 1792 of yacc.c */ -#line 13899 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13904 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX_STRING db={(char*) any_db,3}; (yyval.table)= new Table_ident(YYTHD, db,(yyvsp[(1) - (1)].lex_str),0); @@ -34628,13 +34633,13 @@ case 1972: /* Line 1792 of yacc.c */ -#line 13908 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13913 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); } break; case 1973: /* Line 1792 of yacc.c */ -#line 13910 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13915 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; @@ -34665,7 +34670,7 @@ case 1974: /* Line 1792 of yacc.c */ -#line 13940 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13945 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!strcont((yyvsp[(1) - (1)].lex_str).str, "\n")) (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); @@ -34679,7 +34684,7 @@ case 1975: /* Line 1792 of yacc.c */ -#line 13953 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13958 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; @@ -34696,7 +34701,7 @@ case 1976: /* Line 1792 of yacc.c */ -#line 13969 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13974 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; @@ -34713,7 +34718,7 @@ case 1977: /* Line 1792 of yacc.c */ -#line 13985 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 13990 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; @@ -34731,13 +34736,13 @@ case 1978: /* Line 1792 of yacc.c */ -#line 14001 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14006 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); } break; case 1979: /* Line 1792 of yacc.c */ -#line 14003 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14008 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length); @@ -34749,13 +34754,13 @@ case 1980: /* Line 1792 of yacc.c */ -#line 14013 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14018 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); } break; case 1981: /* Line 1792 of yacc.c */ -#line 14015 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14020 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length); @@ -34767,25 +34772,25 @@ case 1982: /* Line 1792 of yacc.c */ -#line 14025 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14030 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);} break; case 1983: /* Line 1792 of yacc.c */ -#line 14026 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14031 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);} break; case 1984: /* Line 1792 of yacc.c */ -#line 14027 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14032 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);} break; case 1985: /* Line 1792 of yacc.c */ -#line 14032 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14037 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) @@ -34816,7 +34821,7 @@ case 1986: /* Line 1792 of yacc.c */ -#line 14059 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14064 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) @@ -34853,7 +34858,7 @@ case 1987: /* Line 1792 of yacc.c */ -#line 14092 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14097 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user)))) MYSQL_YYABORT; @@ -34868,2113 +34873,2113 @@ case 1988: /* Line 1792 of yacc.c */ -#line 14106 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14111 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1989: /* Line 1792 of yacc.c */ -#line 14107 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14112 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1990: /* Line 1792 of yacc.c */ -#line 14108 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14113 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1991: /* Line 1792 of yacc.c */ -#line 14109 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14114 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1992: /* Line 1792 of yacc.c */ -#line 14110 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14115 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1993: /* Line 1792 of yacc.c */ -#line 14111 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14116 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1994: /* Line 1792 of yacc.c */ -#line 14112 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14117 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1995: /* Line 1792 of yacc.c */ -#line 14113 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14118 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1996: /* Line 1792 of yacc.c */ -#line 14114 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14119 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1997: /* Line 1792 of yacc.c */ -#line 14115 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14120 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1998: /* Line 1792 of yacc.c */ -#line 14116 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14121 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 1999: /* Line 1792 of yacc.c */ -#line 14117 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14122 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2000: /* Line 1792 of yacc.c */ -#line 14118 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14123 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2001: /* Line 1792 of yacc.c */ -#line 14119 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14124 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2002: /* Line 1792 of yacc.c */ -#line 14120 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14125 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2003: /* Line 1792 of yacc.c */ -#line 14121 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14126 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2004: /* Line 1792 of yacc.c */ -#line 14122 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14127 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2005: /* Line 1792 of yacc.c */ -#line 14123 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14128 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2006: /* Line 1792 of yacc.c */ -#line 14124 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14129 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2007: /* Line 1792 of yacc.c */ -#line 14125 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14130 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2008: /* Line 1792 of yacc.c */ -#line 14126 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14131 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2009: /* Line 1792 of yacc.c */ -#line 14127 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14132 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2010: /* Line 1792 of yacc.c */ -#line 14128 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14133 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2011: /* Line 1792 of yacc.c */ -#line 14129 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14134 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2012: /* Line 1792 of yacc.c */ -#line 14130 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14135 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2013: /* Line 1792 of yacc.c */ -#line 14131 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14136 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2014: /* Line 1792 of yacc.c */ -#line 14132 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14137 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2015: /* Line 1792 of yacc.c */ -#line 14133 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14138 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2016: /* Line 1792 of yacc.c */ -#line 14134 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14139 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2017: /* Line 1792 of yacc.c */ -#line 14135 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14140 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2018: /* Line 1792 of yacc.c */ -#line 14136 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14141 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2019: /* Line 1792 of yacc.c */ -#line 14137 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14142 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2020: /* Line 1792 of yacc.c */ -#line 14138 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14143 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2021: /* Line 1792 of yacc.c */ -#line 14139 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14144 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2022: /* Line 1792 of yacc.c */ -#line 14140 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14145 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2023: /* Line 1792 of yacc.c */ -#line 14141 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14146 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2024: /* Line 1792 of yacc.c */ -#line 14142 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14147 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2025: /* Line 1792 of yacc.c */ -#line 14143 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14148 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2026: /* Line 1792 of yacc.c */ -#line 14144 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14149 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2027: /* Line 1792 of yacc.c */ -#line 14145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2028: /* Line 1792 of yacc.c */ -#line 14146 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14151 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2029: /* Line 1792 of yacc.c */ -#line 14147 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14152 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2030: /* Line 1792 of yacc.c */ -#line 14148 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14153 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2031: /* Line 1792 of yacc.c */ -#line 14149 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14154 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2032: /* Line 1792 of yacc.c */ -#line 14150 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14155 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2033: /* Line 1792 of yacc.c */ -#line 14151 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14156 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2034: /* Line 1792 of yacc.c */ -#line 14152 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14157 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2035: /* Line 1792 of yacc.c */ -#line 14153 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14158 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2036: /* Line 1792 of yacc.c */ -#line 14154 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14159 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2037: /* Line 1792 of yacc.c */ -#line 14155 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14160 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2038: /* Line 1792 of yacc.c */ -#line 14165 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14170 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2039: /* Line 1792 of yacc.c */ -#line 14166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2040: /* Line 1792 of yacc.c */ -#line 14167 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14172 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2041: /* Line 1792 of yacc.c */ -#line 14168 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14173 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2042: /* Line 1792 of yacc.c */ -#line 14169 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14174 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2043: /* Line 1792 of yacc.c */ -#line 14170 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14175 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2044: /* Line 1792 of yacc.c */ -#line 14171 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14176 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2045: /* Line 1792 of yacc.c */ -#line 14172 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14177 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2046: /* Line 1792 of yacc.c */ -#line 14173 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14178 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2047: /* Line 1792 of yacc.c */ -#line 14174 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14179 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2048: /* Line 1792 of yacc.c */ -#line 14175 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14180 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2049: /* Line 1792 of yacc.c */ -#line 14176 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14181 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2050: /* Line 1792 of yacc.c */ -#line 14177 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14182 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2051: /* Line 1792 of yacc.c */ -#line 14178 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14183 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2052: /* Line 1792 of yacc.c */ -#line 14179 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14184 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2053: /* Line 1792 of yacc.c */ -#line 14180 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14185 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2054: /* Line 1792 of yacc.c */ -#line 14181 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14186 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2055: /* Line 1792 of yacc.c */ -#line 14182 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14187 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2056: /* Line 1792 of yacc.c */ -#line 14183 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14188 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2057: /* Line 1792 of yacc.c */ -#line 14184 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14189 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2058: /* Line 1792 of yacc.c */ -#line 14185 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14190 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2059: /* Line 1792 of yacc.c */ -#line 14186 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14191 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2060: /* Line 1792 of yacc.c */ -#line 14187 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14192 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2061: /* Line 1792 of yacc.c */ -#line 14188 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14193 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2062: /* Line 1792 of yacc.c */ -#line 14189 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14194 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2063: /* Line 1792 of yacc.c */ -#line 14190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2064: /* Line 1792 of yacc.c */ -#line 14191 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14196 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2065: /* Line 1792 of yacc.c */ -#line 14192 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14197 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2066: /* Line 1792 of yacc.c */ -#line 14193 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14198 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2067: /* Line 1792 of yacc.c */ -#line 14194 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14199 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2068: /* Line 1792 of yacc.c */ -#line 14195 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14200 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2069: /* Line 1792 of yacc.c */ -#line 14196 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14201 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2070: /* Line 1792 of yacc.c */ -#line 14197 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14202 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2071: /* Line 1792 of yacc.c */ -#line 14198 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14203 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2072: /* Line 1792 of yacc.c */ -#line 14199 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14204 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2073: /* Line 1792 of yacc.c */ -#line 14200 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14205 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2074: /* Line 1792 of yacc.c */ -#line 14201 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14206 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2075: /* Line 1792 of yacc.c */ -#line 14202 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14207 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2076: /* Line 1792 of yacc.c */ -#line 14203 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14208 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2077: /* Line 1792 of yacc.c */ -#line 14204 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14209 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2078: /* Line 1792 of yacc.c */ -#line 14205 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14210 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2079: /* Line 1792 of yacc.c */ -#line 14206 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14211 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2080: /* Line 1792 of yacc.c */ -#line 14207 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14212 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2081: /* Line 1792 of yacc.c */ -#line 14208 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14213 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2082: /* Line 1792 of yacc.c */ -#line 14209 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14214 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2083: /* Line 1792 of yacc.c */ -#line 14214 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14219 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2084: /* Line 1792 of yacc.c */ -#line 14215 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14220 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2085: /* Line 1792 of yacc.c */ -#line 14216 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2086: /* Line 1792 of yacc.c */ -#line 14217 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14222 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2087: /* Line 1792 of yacc.c */ -#line 14218 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14223 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2088: /* Line 1792 of yacc.c */ -#line 14219 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14224 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2089: /* Line 1792 of yacc.c */ -#line 14220 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14225 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2090: /* Line 1792 of yacc.c */ -#line 14221 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14226 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2091: /* Line 1792 of yacc.c */ -#line 14222 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14227 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2092: /* Line 1792 of yacc.c */ -#line 14223 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14228 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2093: /* Line 1792 of yacc.c */ -#line 14224 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14229 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2094: /* Line 1792 of yacc.c */ -#line 14225 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14230 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2095: /* Line 1792 of yacc.c */ -#line 14226 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14231 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2096: /* Line 1792 of yacc.c */ -#line 14227 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14232 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2097: /* Line 1792 of yacc.c */ -#line 14228 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14233 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2098: /* Line 1792 of yacc.c */ -#line 14229 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14234 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2099: /* Line 1792 of yacc.c */ -#line 14230 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14235 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2100: /* Line 1792 of yacc.c */ -#line 14231 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14236 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2101: /* Line 1792 of yacc.c */ -#line 14232 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14237 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2102: /* Line 1792 of yacc.c */ -#line 14233 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14238 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2103: /* Line 1792 of yacc.c */ -#line 14234 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14239 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2104: /* Line 1792 of yacc.c */ -#line 14235 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14240 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2105: /* Line 1792 of yacc.c */ -#line 14236 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14241 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2106: /* Line 1792 of yacc.c */ -#line 14237 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14242 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2107: /* Line 1792 of yacc.c */ -#line 14238 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14243 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2108: /* Line 1792 of yacc.c */ -#line 14239 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14244 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2109: /* Line 1792 of yacc.c */ -#line 14240 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14245 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2110: /* Line 1792 of yacc.c */ -#line 14241 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14246 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2111: /* Line 1792 of yacc.c */ -#line 14242 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14247 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2112: /* Line 1792 of yacc.c */ -#line 14243 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14248 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2113: /* Line 1792 of yacc.c */ -#line 14244 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14249 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2114: /* Line 1792 of yacc.c */ -#line 14245 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14250 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2115: /* Line 1792 of yacc.c */ -#line 14246 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14251 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2116: /* Line 1792 of yacc.c */ -#line 14247 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14252 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2117: /* Line 1792 of yacc.c */ -#line 14248 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14253 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2118: /* Line 1792 of yacc.c */ -#line 14249 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14254 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2119: /* Line 1792 of yacc.c */ -#line 14250 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14255 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2120: /* Line 1792 of yacc.c */ -#line 14251 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14256 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2121: /* Line 1792 of yacc.c */ -#line 14252 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14257 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2122: /* Line 1792 of yacc.c */ -#line 14253 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14258 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2123: /* Line 1792 of yacc.c */ -#line 14254 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14259 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2124: /* Line 1792 of yacc.c */ -#line 14255 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14260 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2125: /* Line 1792 of yacc.c */ -#line 14256 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14261 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2126: /* Line 1792 of yacc.c */ -#line 14257 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14262 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2127: /* Line 1792 of yacc.c */ -#line 14258 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14263 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2128: /* Line 1792 of yacc.c */ -#line 14259 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14264 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2129: /* Line 1792 of yacc.c */ -#line 14260 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14265 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2130: /* Line 1792 of yacc.c */ -#line 14261 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14266 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2131: /* Line 1792 of yacc.c */ -#line 14262 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14267 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2132: /* Line 1792 of yacc.c */ -#line 14263 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14268 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2133: /* Line 1792 of yacc.c */ -#line 14264 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14269 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2134: /* Line 1792 of yacc.c */ -#line 14265 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14270 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2135: /* Line 1792 of yacc.c */ -#line 14266 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14271 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2136: /* Line 1792 of yacc.c */ -#line 14267 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14272 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2137: /* Line 1792 of yacc.c */ -#line 14268 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14273 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2138: /* Line 1792 of yacc.c */ -#line 14269 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14274 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2139: /* Line 1792 of yacc.c */ -#line 14270 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14275 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2140: /* Line 1792 of yacc.c */ -#line 14271 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14276 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2141: /* Line 1792 of yacc.c */ -#line 14272 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14277 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2142: /* Line 1792 of yacc.c */ -#line 14273 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14278 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2143: /* Line 1792 of yacc.c */ -#line 14274 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14279 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2144: /* Line 1792 of yacc.c */ -#line 14275 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14280 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2145: /* Line 1792 of yacc.c */ -#line 14276 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14281 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2146: /* Line 1792 of yacc.c */ -#line 14277 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14282 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2147: /* Line 1792 of yacc.c */ -#line 14278 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14283 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2148: /* Line 1792 of yacc.c */ -#line 14279 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14284 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2149: /* Line 1792 of yacc.c */ -#line 14280 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14285 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2150: /* Line 1792 of yacc.c */ -#line 14281 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14286 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2151: /* Line 1792 of yacc.c */ -#line 14282 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14287 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2152: /* Line 1792 of yacc.c */ -#line 14283 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14288 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2153: /* Line 1792 of yacc.c */ -#line 14284 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14289 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2154: /* Line 1792 of yacc.c */ -#line 14285 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14290 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2155: /* Line 1792 of yacc.c */ -#line 14286 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14291 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2156: /* Line 1792 of yacc.c */ -#line 14287 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14292 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2157: /* Line 1792 of yacc.c */ -#line 14288 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14293 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2158: /* Line 1792 of yacc.c */ -#line 14289 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14294 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2159: /* Line 1792 of yacc.c */ -#line 14290 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14295 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2160: /* Line 1792 of yacc.c */ -#line 14291 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14296 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2161: /* Line 1792 of yacc.c */ -#line 14292 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14297 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2162: /* Line 1792 of yacc.c */ -#line 14293 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14298 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2163: /* Line 1792 of yacc.c */ -#line 14294 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14299 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2164: /* Line 1792 of yacc.c */ -#line 14295 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14300 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2165: /* Line 1792 of yacc.c */ -#line 14296 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14301 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2166: /* Line 1792 of yacc.c */ -#line 14297 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14302 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2167: /* Line 1792 of yacc.c */ -#line 14298 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14303 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2168: /* Line 1792 of yacc.c */ -#line 14299 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14304 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2169: /* Line 1792 of yacc.c */ -#line 14300 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14305 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2170: /* Line 1792 of yacc.c */ -#line 14301 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14306 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2171: /* Line 1792 of yacc.c */ -#line 14302 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14307 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2172: /* Line 1792 of yacc.c */ -#line 14303 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14308 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2173: /* Line 1792 of yacc.c */ -#line 14304 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14309 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2174: /* Line 1792 of yacc.c */ -#line 14305 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14310 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2175: /* Line 1792 of yacc.c */ -#line 14306 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14311 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2176: /* Line 1792 of yacc.c */ -#line 14307 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14312 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2177: /* Line 1792 of yacc.c */ -#line 14308 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14313 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2178: /* Line 1792 of yacc.c */ -#line 14309 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14314 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2179: /* Line 1792 of yacc.c */ -#line 14310 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14315 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2180: /* Line 1792 of yacc.c */ -#line 14311 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14316 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2181: /* Line 1792 of yacc.c */ -#line 14312 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14317 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2182: /* Line 1792 of yacc.c */ -#line 14313 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14318 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2183: /* Line 1792 of yacc.c */ -#line 14314 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14319 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2184: /* Line 1792 of yacc.c */ -#line 14315 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14320 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2185: /* Line 1792 of yacc.c */ -#line 14316 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14321 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2186: /* Line 1792 of yacc.c */ -#line 14317 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14322 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2187: /* Line 1792 of yacc.c */ -#line 14318 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14323 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2188: /* Line 1792 of yacc.c */ -#line 14319 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14324 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2189: /* Line 1792 of yacc.c */ -#line 14320 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14325 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2190: /* Line 1792 of yacc.c */ -#line 14321 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14326 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2191: /* Line 1792 of yacc.c */ -#line 14322 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14327 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2192: /* Line 1792 of yacc.c */ -#line 14323 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14328 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2193: /* Line 1792 of yacc.c */ -#line 14324 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14329 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2194: /* Line 1792 of yacc.c */ -#line 14325 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14330 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2195: /* Line 1792 of yacc.c */ -#line 14326 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14331 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2196: /* Line 1792 of yacc.c */ -#line 14327 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14332 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2197: /* Line 1792 of yacc.c */ -#line 14328 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14333 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2198: /* Line 1792 of yacc.c */ -#line 14329 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14334 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2199: /* Line 1792 of yacc.c */ -#line 14330 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14335 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2200: /* Line 1792 of yacc.c */ -#line 14331 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14336 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2201: /* Line 1792 of yacc.c */ -#line 14332 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14337 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2202: /* Line 1792 of yacc.c */ -#line 14333 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14338 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2203: /* Line 1792 of yacc.c */ -#line 14334 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14339 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2204: /* Line 1792 of yacc.c */ -#line 14335 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14340 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2205: /* Line 1792 of yacc.c */ -#line 14336 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14341 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2206: /* Line 1792 of yacc.c */ -#line 14337 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14342 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2207: /* Line 1792 of yacc.c */ -#line 14338 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14343 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2208: /* Line 1792 of yacc.c */ -#line 14339 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14344 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2209: /* Line 1792 of yacc.c */ -#line 14340 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14345 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2210: /* Line 1792 of yacc.c */ -#line 14341 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14346 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2211: /* Line 1792 of yacc.c */ -#line 14342 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14347 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2212: /* Line 1792 of yacc.c */ -#line 14343 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14348 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2213: /* Line 1792 of yacc.c */ -#line 14344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2214: /* Line 1792 of yacc.c */ -#line 14345 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14350 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2215: /* Line 1792 of yacc.c */ -#line 14346 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14351 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2216: /* Line 1792 of yacc.c */ -#line 14347 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14352 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2217: /* Line 1792 of yacc.c */ -#line 14348 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14353 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2218: /* Line 1792 of yacc.c */ -#line 14349 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14354 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2219: /* Line 1792 of yacc.c */ -#line 14350 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14355 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2220: /* Line 1792 of yacc.c */ -#line 14351 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14356 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2221: /* Line 1792 of yacc.c */ -#line 14352 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14357 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2222: /* Line 1792 of yacc.c */ -#line 14353 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14358 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2223: /* Line 1792 of yacc.c */ -#line 14354 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14359 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2224: /* Line 1792 of yacc.c */ -#line 14355 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14360 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2225: /* Line 1792 of yacc.c */ -#line 14356 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14361 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2226: /* Line 1792 of yacc.c */ -#line 14357 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14362 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2227: /* Line 1792 of yacc.c */ -#line 14358 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14363 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2228: /* Line 1792 of yacc.c */ -#line 14359 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14364 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2229: /* Line 1792 of yacc.c */ -#line 14360 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14365 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2230: /* Line 1792 of yacc.c */ -#line 14361 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14366 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2231: /* Line 1792 of yacc.c */ -#line 14362 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14367 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2232: /* Line 1792 of yacc.c */ -#line 14363 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14368 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2233: /* Line 1792 of yacc.c */ -#line 14364 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14369 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2234: /* Line 1792 of yacc.c */ -#line 14365 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14370 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2235: /* Line 1792 of yacc.c */ -#line 14366 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14371 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2236: /* Line 1792 of yacc.c */ -#line 14367 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14372 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2237: /* Line 1792 of yacc.c */ -#line 14368 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14373 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2238: /* Line 1792 of yacc.c */ -#line 14369 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14374 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2239: /* Line 1792 of yacc.c */ -#line 14370 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14375 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2240: /* Line 1792 of yacc.c */ -#line 14371 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14376 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2241: /* Line 1792 of yacc.c */ -#line 14372 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14377 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2242: /* Line 1792 of yacc.c */ -#line 14373 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14378 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2243: /* Line 1792 of yacc.c */ -#line 14374 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14379 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2244: /* Line 1792 of yacc.c */ -#line 14375 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14380 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2245: /* Line 1792 of yacc.c */ -#line 14376 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14381 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2246: /* Line 1792 of yacc.c */ -#line 14377 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14382 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2247: /* Line 1792 of yacc.c */ -#line 14378 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14383 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2248: /* Line 1792 of yacc.c */ -#line 14379 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14384 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2249: /* Line 1792 of yacc.c */ -#line 14380 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14385 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2250: /* Line 1792 of yacc.c */ -#line 14381 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14386 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2251: /* Line 1792 of yacc.c */ -#line 14382 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14387 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2252: /* Line 1792 of yacc.c */ -#line 14383 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14388 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2253: /* Line 1792 of yacc.c */ -#line 14384 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14389 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2254: /* Line 1792 of yacc.c */ -#line 14385 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14390 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2255: /* Line 1792 of yacc.c */ -#line 14386 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14391 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2256: /* Line 1792 of yacc.c */ -#line 14387 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14392 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2257: /* Line 1792 of yacc.c */ -#line 14388 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14393 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2258: /* Line 1792 of yacc.c */ -#line 14389 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14394 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2259: /* Line 1792 of yacc.c */ -#line 14390 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14395 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2260: /* Line 1792 of yacc.c */ -#line 14391 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14396 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2261: /* Line 1792 of yacc.c */ -#line 14392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2262: /* Line 1792 of yacc.c */ -#line 14393 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14398 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2263: /* Line 1792 of yacc.c */ -#line 14394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14399 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2264: /* Line 1792 of yacc.c */ -#line 14395 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14400 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2265: /* Line 1792 of yacc.c */ -#line 14396 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14401 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2266: /* Line 1792 of yacc.c */ -#line 14397 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14402 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2267: /* Line 1792 of yacc.c */ -#line 14398 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14403 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2268: /* Line 1792 of yacc.c */ -#line 14399 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14404 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2269: /* Line 1792 of yacc.c */ -#line 14400 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14405 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2270: /* Line 1792 of yacc.c */ -#line 14401 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14406 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2271: /* Line 1792 of yacc.c */ -#line 14402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2272: /* Line 1792 of yacc.c */ -#line 14403 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14408 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2273: /* Line 1792 of yacc.c */ -#line 14404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2274: /* Line 1792 of yacc.c */ -#line 14405 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14410 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2275: /* Line 1792 of yacc.c */ -#line 14406 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14411 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2276: /* Line 1792 of yacc.c */ -#line 14407 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14412 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2277: /* Line 1792 of yacc.c */ -#line 14408 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14413 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2278: /* Line 1792 of yacc.c */ -#line 14409 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14414 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2279: /* Line 1792 of yacc.c */ -#line 14410 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14415 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2280: /* Line 1792 of yacc.c */ -#line 14411 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14416 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2281: /* Line 1792 of yacc.c */ -#line 14412 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14417 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2282: /* Line 1792 of yacc.c */ -#line 14413 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14418 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2283: /* Line 1792 of yacc.c */ -#line 14414 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14419 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2284: /* Line 1792 of yacc.c */ -#line 14415 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14420 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2285: /* Line 1792 of yacc.c */ -#line 14416 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14421 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2286: /* Line 1792 of yacc.c */ -#line 14417 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14422 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2287: /* Line 1792 of yacc.c */ -#line 14418 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14423 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2288: /* Line 1792 of yacc.c */ -#line 14419 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14424 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2289: /* Line 1792 of yacc.c */ -#line 14420 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14425 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2290: /* Line 1792 of yacc.c */ -#line 14421 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14426 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2291: /* Line 1792 of yacc.c */ -#line 14422 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14427 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2292: /* Line 1792 of yacc.c */ -#line 14423 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14428 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2293: /* Line 1792 of yacc.c */ -#line 14424 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14429 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2294: /* Line 1792 of yacc.c */ -#line 14425 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14430 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2295: /* Line 1792 of yacc.c */ -#line 14426 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14431 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2296: /* Line 1792 of yacc.c */ -#line 14427 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14432 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2297: /* Line 1792 of yacc.c */ -#line 14428 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14433 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2298: /* Line 1792 of yacc.c */ -#line 14429 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14434 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2299: /* Line 1792 of yacc.c */ -#line 14430 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14435 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2300: /* Line 1792 of yacc.c */ -#line 14431 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14436 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2301: /* Line 1792 of yacc.c */ -#line 14432 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14437 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2302: /* Line 1792 of yacc.c */ -#line 14433 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14438 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2303: /* Line 1792 of yacc.c */ -#line 14434 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14439 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2304: /* Line 1792 of yacc.c */ -#line 14435 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14440 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2305: /* Line 1792 of yacc.c */ -#line 14436 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14441 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2306: /* Line 1792 of yacc.c */ -#line 14437 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14442 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2307: /* Line 1792 of yacc.c */ -#line 14438 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14443 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2308: /* Line 1792 of yacc.c */ -#line 14439 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14444 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2309: /* Line 1792 of yacc.c */ -#line 14440 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14445 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2310: /* Line 1792 of yacc.c */ -#line 14441 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14446 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2311: /* Line 1792 of yacc.c */ -#line 14442 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14447 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2312: /* Line 1792 of yacc.c */ -#line 14443 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14448 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2313: /* Line 1792 of yacc.c */ -#line 14444 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14449 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2314: /* Line 1792 of yacc.c */ -#line 14445 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14450 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2315: /* Line 1792 of yacc.c */ -#line 14446 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14451 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2316: /* Line 1792 of yacc.c */ -#line 14447 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14452 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2317: /* Line 1792 of yacc.c */ -#line 14448 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14453 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2318: /* Line 1792 of yacc.c */ -#line 14449 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14454 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2319: /* Line 1792 of yacc.c */ -#line 14450 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14455 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2320: /* Line 1792 of yacc.c */ -#line 14451 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14456 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2321: /* Line 1792 of yacc.c */ -#line 14452 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14457 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2322: /* Line 1792 of yacc.c */ -#line 14453 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14458 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2323: /* Line 1792 of yacc.c */ -#line 14454 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14459 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2324: /* Line 1792 of yacc.c */ -#line 14455 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14460 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2325: /* Line 1792 of yacc.c */ -#line 14456 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14461 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2326: /* Line 1792 of yacc.c */ -#line 14457 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14462 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2327: /* Line 1792 of yacc.c */ -#line 14458 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14463 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2328: /* Line 1792 of yacc.c */ -#line 14459 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14464 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2329: /* Line 1792 of yacc.c */ -#line 14460 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14465 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2330: /* Line 1792 of yacc.c */ -#line 14461 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14466 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2331: /* Line 1792 of yacc.c */ -#line 14462 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14467 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2332: /* Line 1792 of yacc.c */ -#line 14463 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14468 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2333: /* Line 1792 of yacc.c */ -#line 14464 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14469 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2334: /* Line 1792 of yacc.c */ -#line 14465 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14470 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2335: /* Line 1792 of yacc.c */ -#line 14466 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14471 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2336: /* Line 1792 of yacc.c */ -#line 14467 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14472 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2337: /* Line 1792 of yacc.c */ -#line 14468 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14473 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2338: /* Line 1792 of yacc.c */ -#line 14469 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14474 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2339: /* Line 1792 of yacc.c */ -#line 14481 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14486 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; mysql_init_select(lex); @@ -36990,13 +36995,13 @@ case 2340: /* Line 1792 of yacc.c */ -#line 14493 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14498 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2341: /* Line 1792 of yacc.c */ -#line 14500 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14505 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37005,7 +37010,7 @@ case 2343: /* Line 1792 of yacc.c */ -#line 14506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->option_type= OPT_DEFAULT; } @@ -37013,7 +37018,7 @@ case 2344: /* Line 1792 of yacc.c */ -#line 14510 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14515 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37022,7 +37027,7 @@ case 2345: /* Line 1792 of yacc.c */ -#line 14515 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14520 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->option_type= (yyvsp[(1) - (1)].var_type); } @@ -37030,7 +37035,7 @@ case 2347: /* Line 1792 of yacc.c */ -#line 14525 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14530 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37039,7 +37044,7 @@ case 2349: /* Line 1792 of yacc.c */ -#line 14531 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14536 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37048,7 +37053,7 @@ case 2352: /* Line 1792 of yacc.c */ -#line 14545 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14550 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { sp_create_assignment_lex(YYTHD, YY_TOKEN_START); } @@ -37056,7 +37061,7 @@ case 2353: /* Line 1792 of yacc.c */ -#line 14549 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14554 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37065,7 +37070,7 @@ case 2354: /* Line 1792 of yacc.c */ -#line 14554 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14559 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { sp_create_assignment_lex(YYTHD, YY_TOKEN_START); } @@ -37073,7 +37078,7 @@ case 2355: /* Line 1792 of yacc.c */ -#line 14558 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14563 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END)) MYSQL_YYABORT; @@ -37082,7 +37087,7 @@ case 2356: /* Line 1792 of yacc.c */ -#line 14567 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14572 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->option_type= (yyvsp[(1) - (1)].var_type); } @@ -37090,73 +37095,73 @@ case 2359: /* Line 1792 of yacc.c */ -#line 14575 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14580 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_GLOBAL; } break; case 2360: /* Line 1792 of yacc.c */ -#line 14576 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14581 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2361: /* Line 1792 of yacc.c */ -#line 14577 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14582 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2362: /* Line 1792 of yacc.c */ -#line 14581 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14586 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2363: /* Line 1792 of yacc.c */ -#line 14582 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14587 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_GLOBAL; } break; case 2364: /* Line 1792 of yacc.c */ -#line 14583 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14588 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2365: /* Line 1792 of yacc.c */ -#line 14584 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14589 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2366: /* Line 1792 of yacc.c */ -#line 14588 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14593 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_DEFAULT; } break; case 2367: /* Line 1792 of yacc.c */ -#line 14589 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14594 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_GLOBAL; } break; case 2368: /* Line 1792 of yacc.c */ -#line 14590 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14595 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2369: /* Line 1792 of yacc.c */ -#line 14591 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14596 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.var_type)=OPT_SESSION; } break; case 2370: /* Line 1792 of yacc.c */ -#line 14597 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14602 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -37181,7 +37186,7 @@ case 2371: /* Line 1792 of yacc.c */ -#line 14622 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14627 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { sp_head *sp= Lex->sphead; @@ -37192,7 +37197,7 @@ case 2372: /* Line 1792 of yacc.c */ -#line 14629 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14634 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -37289,7 +37294,7 @@ case 2373: /* Line 1792 of yacc.c */ -#line 14722 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14727 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Item_func_set_user_var *item; item= new (YYTHD->mem_root) Item_func_set_user_var((yyvsp[(2) - (4)].lex_str), (yyvsp[(4) - (4)].item), false); @@ -37304,7 +37309,7 @@ case 2374: /* Line 1792 of yacc.c */ -#line 14733 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14738 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; struct sys_var_with_base tmp= (yyvsp[(4) - (6)].variable); @@ -37321,7 +37326,7 @@ case 2375: /* Line 1792 of yacc.c */ -#line 14746 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14751 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -37341,7 +37346,7 @@ case 2376: /* Line 1792 of yacc.c */ -#line 14762 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14767 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_pcontext *pctx= lex->get_sp_current_parsing_ctx(); @@ -37358,7 +37363,7 @@ case 2377: /* Line 1792 of yacc.c */ -#line 14775 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14780 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; const CHARSET_INFO *cs2; @@ -37384,7 +37389,7 @@ case 2378: /* Line 1792 of yacc.c */ -#line 14797 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14802 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -37423,7 +37428,7 @@ case 2379: /* Line 1792 of yacc.c */ -#line 14832 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14837 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX_USER *user= (yyvsp[(3) - (5)].lex_user); LEX *lex= Lex; @@ -37466,7 +37471,7 @@ case 2380: /* Line 1792 of yacc.c */ -#line 14874 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14879 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -37498,7 +37503,7 @@ case 2381: /* Line 1792 of yacc.c */ -#line 14902 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14907 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -37548,7 +37553,7 @@ case 2382: /* Line 1792 of yacc.c */ -#line 14948 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14953 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { sys_var *tmp=find_sys_var(YYTHD, (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length); if (!tmp) @@ -37563,7 +37568,7 @@ case 2387: /* Line 1792 of yacc.c */ -#line 14969 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14974 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex=Lex; @@ -37582,7 +37587,7 @@ case 2388: /* Line 1792 of yacc.c */ -#line 14987 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 14992 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex=Lex; @@ -37601,49 +37606,49 @@ case 2389: /* Line 1792 of yacc.c */ -#line 15004 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15009 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= true; } break; case 2390: /* Line 1792 of yacc.c */ -#line 15005 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15010 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= false; } break; case 2391: /* Line 1792 of yacc.c */ -#line 15009 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15014 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; } break; case 2392: /* Line 1792 of yacc.c */ -#line 15010 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15015 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.tx_isolation)= ISO_READ_COMMITTED; } break; case 2393: /* Line 1792 of yacc.c */ -#line 15011 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15016 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.tx_isolation)= ISO_REPEATABLE_READ; } break; case 2394: /* Line 1792 of yacc.c */ -#line 15012 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15017 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.tx_isolation)= ISO_SERIALIZABLE; } break; case 2395: /* Line 1792 of yacc.c */ -#line 15016 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15021 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;} break; case 2396: /* Line 1792 of yacc.c */ -#line 15018 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15023 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if ((yyvsp[(3) - (4)].lex_str).length == 0) (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).str; @@ -37665,7 +37670,7 @@ case 2397: /* Line 1792 of yacc.c */ -#line 15036 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15041 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { WARN_DEPRECATED(YYTHD, "OLD_PASSWORD", "PASSWORD"); (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password:: @@ -37679,19 +37684,19 @@ case 2398: /* Line 1792 of yacc.c */ -#line 15049 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15054 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=(yyvsp[(1) - (1)].item); } break; case 2399: /* Line 1792 of yacc.c */ -#line 15050 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15055 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=0; } break; case 2400: /* Line 1792 of yacc.c */ -#line 15052 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15057 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info); if ((yyval.item) == NULL) @@ -37701,7 +37706,7 @@ case 2401: /* Line 1792 of yacc.c */ -#line 15058 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15063 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info); if ((yyval.item) == NULL) @@ -37711,7 +37716,7 @@ case 2402: /* Line 1792 of yacc.c */ -#line 15064 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15069 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.item)=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info); if ((yyval.item) == NULL) @@ -37721,7 +37726,7 @@ case 2403: /* Line 1792 of yacc.c */ -#line 15075 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15080 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -37736,13 +37741,13 @@ case 2404: /* Line 1792 of yacc.c */ -#line 15086 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15091 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2409: /* Line 1792 of yacc.c */ -#line 15101 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15106 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { thr_lock_type lock_type= (thr_lock_type) (yyvsp[(3) - (3)].num); bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE); @@ -37756,19 +37761,19 @@ case 2410: /* Line 1792 of yacc.c */ -#line 15113 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15118 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TL_READ_NO_INSERT; } break; case 2411: /* Line 1792 of yacc.c */ -#line 15114 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15119 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TL_WRITE_DEFAULT; } break; case 2412: /* Line 1792 of yacc.c */ -#line 15116 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15121 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TL_WRITE_LOW_PRIORITY; WARN_DEPRECATED(YYTHD, "LOW_PRIORITY WRITE", "WRITE"); @@ -37777,13 +37782,13 @@ case 2413: /* Line 1792 of yacc.c */ -#line 15120 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15125 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= TL_READ; } break; case 2414: /* Line 1792 of yacc.c */ -#line 15125 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15130 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; @@ -37798,13 +37803,13 @@ case 2415: /* Line 1792 of yacc.c */ -#line 15136 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15141 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2416: /* Line 1792 of yacc.c */ -#line 15145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -37824,7 +37829,7 @@ case 2417: /* Line 1792 of yacc.c */ -#line 15161 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15166 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -37844,7 +37849,7 @@ case 2418: /* Line 1792 of yacc.c */ -#line 15177 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15182 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->sphead) @@ -37866,7 +37871,7 @@ case 2419: /* Line 1792 of yacc.c */ -#line 15195 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15200 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -37888,55 +37893,55 @@ case 2420: /* Line 1792 of yacc.c */ -#line 15215 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15220 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ident= null_lex_str; (yyval.ha_read_mode)=(yyvsp[(1) - (1)].ha_read_mode); } break; case 2421: /* Line 1792 of yacc.c */ -#line 15216 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15221 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ident= (yyvsp[(1) - (2)].lex_str); (yyval.ha_read_mode)=(yyvsp[(2) - (2)].ha_read_mode); } break; case 2422: /* Line 1792 of yacc.c */ -#line 15220 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15225 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RFIRST; } break; case 2423: /* Line 1792 of yacc.c */ -#line 15221 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15226 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RNEXT; } break; case 2424: /* Line 1792 of yacc.c */ -#line 15225 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15230 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RFIRST; } break; case 2425: /* Line 1792 of yacc.c */ -#line 15226 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15231 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RNEXT; } break; case 2426: /* Line 1792 of yacc.c */ -#line 15227 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15232 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RPREV; } break; case 2427: /* Line 1792 of yacc.c */ -#line 15228 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15233 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RLAST; } break; case 2428: /* Line 1792 of yacc.c */ -#line 15230 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15235 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { YYTHD->m_parser_state->m_yacc.m_ha_rkey_mode= (yyvsp[(1) - (1)].ha_rkey_mode); Lex->insert_list= new List_item; @@ -37947,7 +37952,7 @@ case 2429: /* Line 1792 of yacc.c */ -#line 15237 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15242 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_read_mode)= RKEY; } @@ -37955,49 +37960,49 @@ case 2430: /* Line 1792 of yacc.c */ -#line 15243 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15248 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT; } break; case 2431: /* Line 1792 of yacc.c */ -#line 15244 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15249 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; } break; case 2432: /* Line 1792 of yacc.c */ -#line 15245 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15250 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; } break; case 2433: /* Line 1792 of yacc.c */ -#line 15246 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15251 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY; } break; case 2434: /* Line 1792 of yacc.c */ -#line 15247 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15252 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY; } break; case 2435: /* Line 1792 of yacc.c */ -#line 15253 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15258 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_REVOKE; } break; case 2436: /* Line 1792 of yacc.c */ -#line 15254 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15259 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2437: /* Line 1792 of yacc.c */ -#line 15259 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15264 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->type= 0; @@ -38006,7 +38011,7 @@ case 2438: /* Line 1792 of yacc.c */ -#line 15264 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15269 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->columns.elements) @@ -38020,7 +38025,7 @@ case 2439: /* Line 1792 of yacc.c */ -#line 15274 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15279 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->columns.elements) @@ -38034,7 +38039,7 @@ case 2440: /* Line 1792 of yacc.c */ -#line 15284 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15289 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_REVOKE_ALL; } @@ -38042,7 +38047,7 @@ case 2441: /* Line 1792 of yacc.c */ -#line 15288 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15293 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->users_list.push_front ((yyvsp[(3) - (5)].lex_user)); @@ -38052,19 +38057,19 @@ case 2442: /* Line 1792 of yacc.c */ -#line 15296 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15301 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command= SQLCOM_GRANT; } break; case 2443: /* Line 1792 of yacc.c */ -#line 15297 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15302 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2444: /* Line 1792 of yacc.c */ -#line 15303 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15308 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->type= 0; @@ -38073,7 +38078,7 @@ case 2445: /* Line 1792 of yacc.c */ -#line 15309 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15314 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->columns.elements) @@ -38087,7 +38092,7 @@ case 2446: /* Line 1792 of yacc.c */ -#line 15320 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15325 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->columns.elements) @@ -38101,7 +38106,7 @@ case 2447: /* Line 1792 of yacc.c */ -#line 15330 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15335 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->users_list.push_front ((yyvsp[(3) - (6)].lex_user)); @@ -38111,7 +38116,7 @@ case 2450: /* Line 1792 of yacc.c */ -#line 15344 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15349 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; if (lex->grant == GLOBAL_ACLS && @@ -38122,7 +38127,7 @@ case 2451: /* Line 1792 of yacc.c */ -#line 15351 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15356 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->all_privileges= 1; Lex->grant= GLOBAL_ACLS; @@ -38131,223 +38136,223 @@ case 2456: /* Line 1792 of yacc.c */ -#line 15369 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15374 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->which_columns = SELECT_ACL;} break; case 2457: /* Line 1792 of yacc.c */ -#line 15370 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15375 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2458: /* Line 1792 of yacc.c */ -#line 15372 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15377 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->which_columns = INSERT_ACL;} break; case 2459: /* Line 1792 of yacc.c */ -#line 15373 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15378 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2460: /* Line 1792 of yacc.c */ -#line 15375 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15380 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->which_columns = UPDATE_ACL; } break; case 2461: /* Line 1792 of yacc.c */ -#line 15376 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15381 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2462: /* Line 1792 of yacc.c */ -#line 15378 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15383 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->which_columns = REFERENCES_ACL;} break; case 2463: /* Line 1792 of yacc.c */ -#line 15379 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15384 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2464: /* Line 1792 of yacc.c */ -#line 15380 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15385 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= DELETE_ACL;} break; case 2465: /* Line 1792 of yacc.c */ -#line 15381 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15386 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2466: /* Line 1792 of yacc.c */ -#line 15382 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15387 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= INDEX_ACL;} break; case 2467: /* Line 1792 of yacc.c */ -#line 15383 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15388 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= ALTER_ACL;} break; case 2468: /* Line 1792 of yacc.c */ -#line 15384 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15389 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_ACL;} break; case 2469: /* Line 1792 of yacc.c */ -#line 15385 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15390 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= DROP_ACL;} break; case 2470: /* Line 1792 of yacc.c */ -#line 15386 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15391 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= EXECUTE_ACL;} break; case 2471: /* Line 1792 of yacc.c */ -#line 15387 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15392 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= RELOAD_ACL;} break; case 2472: /* Line 1792 of yacc.c */ -#line 15388 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15393 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= SHUTDOWN_ACL;} break; case 2473: /* Line 1792 of yacc.c */ -#line 15389 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15394 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= PROCESS_ACL;} break; case 2474: /* Line 1792 of yacc.c */ -#line 15390 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15395 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= FILE_ACL;} break; case 2475: /* Line 1792 of yacc.c */ -#line 15391 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15396 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= GRANT_ACL;} break; case 2476: /* Line 1792 of yacc.c */ -#line 15392 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15397 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= SHOW_DB_ACL;} break; case 2477: /* Line 1792 of yacc.c */ -#line 15393 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15398 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= SUPER_ACL;} break; case 2478: /* Line 1792 of yacc.c */ -#line 15394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15399 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_TMP_ACL;} break; case 2479: /* Line 1792 of yacc.c */ -#line 15395 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15400 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= LOCK_TABLES_ACL; } break; case 2480: /* Line 1792 of yacc.c */ -#line 15396 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15401 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= REPL_SLAVE_ACL; } break; case 2481: /* Line 1792 of yacc.c */ -#line 15397 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15402 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= REPL_CLIENT_ACL; } break; case 2482: /* Line 1792 of yacc.c */ -#line 15398 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15403 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_VIEW_ACL; } break; case 2483: /* Line 1792 of yacc.c */ -#line 15399 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15404 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= SHOW_VIEW_ACL; } break; case 2484: /* Line 1792 of yacc.c */ -#line 15400 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15405 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_PROC_ACL; } break; case 2485: /* Line 1792 of yacc.c */ -#line 15401 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15406 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= ALTER_PROC_ACL; } break; case 2486: /* Line 1792 of yacc.c */ -#line 15402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_USER_ACL; } break; case 2487: /* Line 1792 of yacc.c */ -#line 15403 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15408 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= EVENT_ACL;} break; case 2488: /* Line 1792 of yacc.c */ -#line 15404 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15409 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= TRIGGER_ACL; } break; case 2489: /* Line 1792 of yacc.c */ -#line 15405 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15410 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= CREATE_TABLESPACE_ACL; } break; case 2490: /* Line 1792 of yacc.c */ -#line 15409 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15414 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2491: /* Line 1792 of yacc.c */ -#line 15410 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15415 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2494: /* Line 1792 of yacc.c */ -#line 15420 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15425 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->x509_subject) @@ -38361,7 +38366,7 @@ case 2495: /* Line 1792 of yacc.c */ -#line 15430 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15435 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->x509_issuer) @@ -38375,7 +38380,7 @@ case 2496: /* Line 1792 of yacc.c */ -#line 15440 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15445 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (lex->ssl_cipher) @@ -38389,7 +38394,7 @@ case 2497: /* Line 1792 of yacc.c */ -#line 15453 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15458 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; size_t dummy; @@ -38408,7 +38413,7 @@ case 2498: /* Line 1792 of yacc.c */ -#line 15468 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15473 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str; @@ -38425,7 +38430,7 @@ case 2499: /* Line 1792 of yacc.c */ -#line 15481 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15486 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->current_select->db = NULL; @@ -38442,7 +38447,7 @@ case 2500: /* Line 1792 of yacc.c */ -#line 15494 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15499 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL, @@ -38455,7 +38460,7 @@ case 2501: /* Line 1792 of yacc.c */ -#line 15506 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15511 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user))) MYSQL_YYABORT; @@ -38464,7 +38469,7 @@ case 2502: /* Line 1792 of yacc.c */ -#line 15511 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15516 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user))) MYSQL_YYABORT; @@ -38473,7 +38478,7 @@ case 2503: /* Line 1792 of yacc.c */ -#line 15519 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15524 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user))) MYSQL_YYABORT; @@ -38482,7 +38487,7 @@ case 2504: /* Line 1792 of yacc.c */ -#line 15524 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15529 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user))) MYSQL_YYABORT; @@ -38491,7 +38496,7 @@ case 2505: /* Line 1792 of yacc.c */ -#line 15532 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15537 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_user)=(yyvsp[(1) - (4)].lex_user); (yyvsp[(1) - (4)].lex_user)->password=(yyvsp[(4) - (4)].lex_str); if (Lex->sql_command == SQLCOM_REVOKE) @@ -38513,7 +38518,7 @@ case 2506: /* Line 1792 of yacc.c */ -#line 15550 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15555 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->sql_command == SQLCOM_REVOKE) { @@ -38537,7 +38542,7 @@ case 2507: /* Line 1792 of yacc.c */ -#line 15570 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15575 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->sql_command == SQLCOM_REVOKE) { @@ -38553,7 +38558,7 @@ case 2508: /* Line 1792 of yacc.c */ -#line 15582 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15587 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->sql_command == SQLCOM_REVOKE) { @@ -38570,7 +38575,7 @@ case 2509: /* Line 1792 of yacc.c */ -#line 15595 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15600 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user); (yyvsp[(1) - (1)].lex_user)->password= null_lex_str; @@ -38579,7 +38584,7 @@ case 2510: /* Line 1792 of yacc.c */ -#line 15603 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15608 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->grant |= lex->which_columns; @@ -38588,7 +38593,7 @@ case 2514: /* Line 1792 of yacc.c */ -#line 15617 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15622 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { String *new_str = new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info); if (new_str == NULL) @@ -38617,7 +38622,7 @@ case 2516: /* Line 1792 of yacc.c */ -#line 15646 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15651 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ssl_type=SSL_TYPE_SPECIFIED; } @@ -38625,7 +38630,7 @@ case 2517: /* Line 1792 of yacc.c */ -#line 15650 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15655 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ssl_type=SSL_TYPE_ANY; } @@ -38633,7 +38638,7 @@ case 2518: /* Line 1792 of yacc.c */ -#line 15654 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15659 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ssl_type=SSL_TYPE_X509; } @@ -38641,7 +38646,7 @@ case 2519: /* Line 1792 of yacc.c */ -#line 15658 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15663 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->ssl_type=SSL_TYPE_NONE; } @@ -38649,43 +38654,43 @@ case 2520: /* Line 1792 of yacc.c */ -#line 15664 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15669 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2522: /* Line 1792 of yacc.c */ -#line 15669 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15674 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2523: /* Line 1792 of yacc.c */ -#line 15670 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15675 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= GRANT_ACL;} break; case 2524: /* Line 1792 of yacc.c */ -#line 15674 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15679 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2525: /* Line 1792 of yacc.c */ -#line 15675 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15680 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2526: /* Line 1792 of yacc.c */ -#line 15679 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15684 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->grant |= GRANT_ACL;} break; case 2527: /* Line 1792 of yacc.c */ -#line 15681 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15686 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num); @@ -38695,7 +38700,7 @@ case 2528: /* Line 1792 of yacc.c */ -#line 15687 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15692 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num); @@ -38705,7 +38710,7 @@ case 2529: /* Line 1792 of yacc.c */ -#line 15693 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15698 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num); @@ -38715,7 +38720,7 @@ case 2530: /* Line 1792 of yacc.c */ -#line 15699 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15704 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->mqh.user_conn= (yyvsp[(2) - (2)].ulong_num); @@ -38725,7 +38730,7 @@ case 2531: /* Line 1792 of yacc.c */ -#line 15708 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15713 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command = SQLCOM_BEGIN; @@ -38735,73 +38740,73 @@ case 2532: /* Line 1792 of yacc.c */ -#line 15713 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15718 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2533: /* Line 1792 of yacc.c */ -#line 15717 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15722 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2534: /* Line 1792 of yacc.c */ -#line 15718 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15723 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2535: /* Line 1792 of yacc.c */ -#line 15723 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15728 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_UNKNOWN; } break; case 2536: /* Line 1792 of yacc.c */ -#line 15724 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15729 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_NO; } break; case 2537: /* Line 1792 of yacc.c */ -#line 15725 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15730 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_YES; } break; case 2538: /* Line 1792 of yacc.c */ -#line 15730 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15735 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_UNKNOWN; } break; case 2539: /* Line 1792 of yacc.c */ -#line 15731 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15736 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_YES; } break; case 2540: /* Line 1792 of yacc.c */ -#line 15732 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15737 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.m_yes_no_unk)= TVL_NO; } break; case 2541: /* Line 1792 of yacc.c */ -#line 15736 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15741 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2542: /* Line 1792 of yacc.c */ -#line 15737 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15742 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2543: /* Line 1792 of yacc.c */ -#line 15742 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15747 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_COMMIT; @@ -38814,7 +38819,7 @@ case 2544: /* Line 1792 of yacc.c */ -#line 15754 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15759 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_ROLLBACK; @@ -38827,7 +38832,7 @@ case 2545: /* Line 1792 of yacc.c */ -#line 15764 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15769 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT; @@ -38837,7 +38842,7 @@ case 2546: /* Line 1792 of yacc.c */ -#line 15773 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15778 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_SAVEPOINT; @@ -38847,7 +38852,7 @@ case 2547: /* Line 1792 of yacc.c */ -#line 15782 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15787 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; lex->sql_command= SQLCOM_RELEASE_SAVEPOINT; @@ -38857,13 +38862,13 @@ case 2548: /* Line 1792 of yacc.c */ -#line 15795 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15800 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2550: /* Line 1792 of yacc.c */ -#line 15801 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15806 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_select_to_union_list(Lex, (bool)(yyvsp[(2) - (2)].num), TRUE)) MYSQL_YYABORT; @@ -38872,7 +38877,7 @@ case 2551: /* Line 1792 of yacc.c */ -#line 15806 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15811 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* Remove from the name resolution context stack the context of the @@ -38884,37 +38889,37 @@ case 2552: /* Line 1792 of yacc.c */ -#line 15816 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15821 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 0; } break; case 2553: /* Line 1792 of yacc.c */ -#line 15817 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15822 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 2554: /* Line 1792 of yacc.c */ -#line 15818 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15823 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)= 1; } break; case 2555: /* Line 1792 of yacc.c */ -#line 15822 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15827 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.is_not_empty)= false; } break; case 2556: /* Line 1792 of yacc.c */ -#line 15823 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15828 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.is_not_empty)= true; } break; case 2557: /* Line 1792 of yacc.c */ -#line 15827 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15832 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -38934,7 +38939,7 @@ case 2558: /* Line 1792 of yacc.c */ -#line 15843 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15848 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; thd->lex->current_select->no_table_names_allowed= 0; @@ -38944,25 +38949,25 @@ case 2561: /* Line 1792 of yacc.c */ -#line 15856 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15861 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=1; } break; case 2562: /* Line 1792 of yacc.c */ -#line 15857 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15862 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=1; } break; case 2563: /* Line 1792 of yacc.c */ -#line 15858 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15863 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.num)=0; } break; case 2564: /* Line 1792 of yacc.c */ -#line 15863 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15868 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.select_lex)= Lex->current_select->master_unit()->first_select(); } @@ -38970,7 +38975,7 @@ case 2565: /* Line 1792 of yacc.c */ -#line 15867 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15872 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.select_lex)= Lex->current_select->master_unit()->first_select(); } @@ -38978,7 +38983,7 @@ case 2567: /* Line 1792 of yacc.c */ -#line 15876 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15881 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE)) MYSQL_YYABORT; @@ -38987,7 +38992,7 @@ case 2568: /* Line 1792 of yacc.c */ -#line 15882 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15887 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->pop_context(); (yyval.select_lex)= (yyvsp[(1) - (6)].select_lex); @@ -38996,7 +39001,7 @@ case 2569: /* Line 1792 of yacc.c */ -#line 15891 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15896 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { (yyval.select_lex)= (yyvsp[(2) - (3)].select_lex); } @@ -39004,7 +39009,7 @@ case 2570: /* Line 1792 of yacc.c */ -#line 15897 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15902 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; if (!lex->expr_allows_subselect || @@ -39027,7 +39032,7 @@ case 2571: /* Line 1792 of yacc.c */ -#line 15918 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15923 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex=Lex; @@ -39054,13 +39059,13 @@ case 2576: /* Line 1792 of yacc.c */ -#line 15953 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15958 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= SELECT_STRAIGHT_JOIN; } break; case 2577: /* Line 1792 of yacc.c */ -#line 15955 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15960 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (check_simple_select()) MYSQL_YYABORT; @@ -39072,25 +39077,25 @@ case 2578: /* Line 1792 of yacc.c */ -#line 15962 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15967 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= SELECT_DISTINCT; } break; case 2579: /* Line 1792 of yacc.c */ -#line 15963 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15968 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= SELECT_SMALL_RESULT; } break; case 2580: /* Line 1792 of yacc.c */ -#line 15964 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15969 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= SELECT_BIG_RESULT; } break; case 2581: /* Line 1792 of yacc.c */ -#line 15966 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15971 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (check_simple_select()) MYSQL_YYABORT; @@ -39100,7 +39105,7 @@ case 2582: /* Line 1792 of yacc.c */ -#line 15972 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15977 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (check_simple_select()) MYSQL_YYABORT; @@ -39110,31 +39115,31 @@ case 2583: /* Line 1792 of yacc.c */ -#line 15977 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15982 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Select->options|= SELECT_ALL; } break; case 2584: /* Line 1792 of yacc.c */ -#line 15988 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15993 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2585: /* Line 1792 of yacc.c */ -#line 15990 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15995 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2586: /* Line 1792 of yacc.c */ -#line 15992 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 15997 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2600: /* Line 1792 of yacc.c */ -#line 16025 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16030 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* We have to distinguish missing DEFINER-clause from case when @@ -39149,7 +39154,7 @@ case 2601: /* Line 1792 of yacc.c */ -#line 16039 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16044 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[(3) - (3)].lex_user)); } @@ -39157,67 +39162,67 @@ case 2602: /* Line 1792 of yacc.c */ -#line 16052 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16057 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2603: /* Line 1792 of yacc.c */ -#line 16054 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16059 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2604: /* Line 1792 of yacc.c */ -#line 16056 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16061 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2605: /* Line 1792 of yacc.c */ -#line 16061 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16066 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; } break; case 2606: /* Line 1792 of yacc.c */ -#line 16066 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16071 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; } break; case 2607: /* Line 1792 of yacc.c */ -#line 16068 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16073 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; } break; case 2608: /* Line 1792 of yacc.c */ -#line 16070 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16075 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; } break; case 2609: /* Line 1792 of yacc.c */ -#line 16075 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16080 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_suid= VIEW_SUID_DEFAULT; } break; case 2610: /* Line 1792 of yacc.c */ -#line 16077 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16082 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_suid= VIEW_SUID_DEFINER; } break; case 2611: /* Line 1792 of yacc.c */ -#line 16079 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16084 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_suid= VIEW_SUID_INVOKER; } break; case 2612: /* Line 1792 of yacc.c */ -#line 16084 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16089 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39234,13 +39239,13 @@ case 2614: /* Line 1792 of yacc.c */ -#line 16101 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16106 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2616: /* Line 1792 of yacc.c */ -#line 16107 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16112 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->view_list.push_back((LEX_STRING*) sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING))); @@ -39249,7 +39254,7 @@ case 2617: /* Line 1792 of yacc.c */ -#line 16112 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16117 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->view_list.push_back((LEX_STRING*) sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING))); @@ -39258,7 +39263,7 @@ case 2618: /* Line 1792 of yacc.c */ -#line 16119 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16124 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->parsing_options.allows_variable= FALSE; @@ -39271,7 +39276,7 @@ case 2619: /* Line 1792 of yacc.c */ -#line 16128 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16133 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -39289,7 +39294,7 @@ case 2620: /* Line 1792 of yacc.c */ -#line 16145 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16150 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (Lex->current_select->set_braces(0)) { @@ -39309,7 +39314,7 @@ case 2623: /* Line 1792 of yacc.c */ -#line 16166 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16171 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { if (setup_select_in_parentheses(Lex)) MYSQL_YYABORT; @@ -39318,7 +39323,7 @@ case 2625: /* Line 1792 of yacc.c */ -#line 16175 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16180 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->current_select->table_list.save_and_clear(&Lex->save_list); } @@ -39326,7 +39331,7 @@ case 2626: /* Line 1792 of yacc.c */ -#line 16179 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16184 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->current_select->table_list.push_front(&Lex->save_list); } @@ -39334,31 +39339,31 @@ case 2627: /* Line 1792 of yacc.c */ -#line 16186 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16191 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_check= VIEW_CHECK_NONE; } break; case 2628: /* Line 1792 of yacc.c */ -#line 16188 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16193 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_check= VIEW_CHECK_CASCADED; } break; case 2629: /* Line 1792 of yacc.c */ -#line 16190 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16195 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_check= VIEW_CHECK_CASCADED; } break; case 2630: /* Line 1792 of yacc.c */ -#line 16192 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16197 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->create_view_check= VIEW_CHECK_LOCAL; } break; case 2631: /* Line 1792 of yacc.c */ -#line 16209 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16214 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $8 */ Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start(); } @@ -39366,7 +39371,7 @@ case 2632: /* Line 1792 of yacc.c */ -#line 16215 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16220 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $12 */ Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start(); } @@ -39374,7 +39379,7 @@ case 2633: /* Line 1792 of yacc.c */ -#line 16220 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16225 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $15 */ THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39408,7 +39413,7 @@ case 2634: /* Line 1792 of yacc.c */ -#line 16250 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16255 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $17 */ THD *thd= YYTHD; LEX *lex= Lex; @@ -39437,7 +39442,7 @@ case 2635: /* Line 1792 of yacc.c */ -#line 16285 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16290 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39458,7 +39463,7 @@ case 2636: /* Line 1792 of yacc.c */ -#line 16303 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16308 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39479,7 +39484,7 @@ case 2637: /* Line 1792 of yacc.c */ -#line 16326 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16331 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $5 */ THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39514,7 +39519,7 @@ case 2638: /* Line 1792 of yacc.c */ -#line 16358 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16363 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $8 */ Lex->sphead->m_parser_data.set_parameter_end_ptr( YYLIP->get_cpp_tok_start()); @@ -39523,7 +39528,7 @@ case 2639: /* Line 1792 of yacc.c */ -#line 16363 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16368 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $10 */ LEX *lex= Lex; lex->charset= NULL; @@ -39535,7 +39540,7 @@ case 2640: /* Line 1792 of yacc.c */ -#line 16371 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16376 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $12 */ LEX *lex= Lex; sp_head *sp= lex->sphead; @@ -39562,7 +39567,7 @@ case 2641: /* Line 1792 of yacc.c */ -#line 16394 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16399 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* $14 */ THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39574,7 +39579,7 @@ case 2642: /* Line 1792 of yacc.c */ -#line 16402 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16407 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39633,7 +39638,7 @@ case 2643: /* Line 1792 of yacc.c */ -#line 16460 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16465 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -39657,7 +39662,7 @@ case 2644: /* Line 1792 of yacc.c */ -#line 16480 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16485 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { /* NOTE: the start of the parameters in the query string is @@ -39673,7 +39678,7 @@ case 2645: /* Line 1792 of yacc.c */ -#line 16493 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16498 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39687,7 +39692,7 @@ case 2646: /* Line 1792 of yacc.c */ -#line 16503 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16508 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= thd->lex; @@ -39699,7 +39704,7 @@ case 2647: /* Line 1792 of yacc.c */ -#line 16511 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16516 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { THD *thd= YYTHD; LEX *lex= Lex; @@ -39712,7 +39717,7 @@ case 2648: /* Line 1792 of yacc.c */ -#line 16525 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16530 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_START; } @@ -39720,7 +39725,7 @@ case 2649: /* Line 1792 of yacc.c */ -#line 16529 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16534 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_END; } @@ -39728,7 +39733,7 @@ case 2650: /* Line 1792 of yacc.c */ -#line 16533 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16538 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_PREPARE; } @@ -39736,7 +39741,7 @@ case 2651: /* Line 1792 of yacc.c */ -#line 16537 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16542 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_COMMIT; } @@ -39744,7 +39749,7 @@ case 2652: /* Line 1792 of yacc.c */ -#line 16541 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16546 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_ROLLBACK; } @@ -39752,7 +39757,7 @@ case 2653: /* Line 1792 of yacc.c */ -#line 16545 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16550 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->sql_command = SQLCOM_XA_RECOVER; } @@ -39760,7 +39765,7 @@ case 2654: /* Line 1792 of yacc.c */ -#line 16552 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16557 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE); if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) @@ -39771,7 +39776,7 @@ case 2655: /* Line 1792 of yacc.c */ -#line 16559 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16564 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (3)].string)->length() <= MAXBQUALSIZE); if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) @@ -39782,7 +39787,7 @@ case 2656: /* Line 1792 of yacc.c */ -#line 16566 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16571 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (5)].string)->length() <= MAXBQUALSIZE); if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) @@ -39793,73 +39798,73 @@ case 2657: /* Line 1792 of yacc.c */ -#line 16575 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16580 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2658: /* Line 1792 of yacc.c */ -#line 16576 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16581 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2659: /* Line 1792 of yacc.c */ -#line 16580 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16585 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_NONE; } break; case 2660: /* Line 1792 of yacc.c */ -#line 16581 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16586 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_JOIN; } break; case 2661: /* Line 1792 of yacc.c */ -#line 16582 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16587 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_RESUME; } break; case 2662: /* Line 1792 of yacc.c */ -#line 16586 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16591 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_NONE; } break; case 2663: /* Line 1792 of yacc.c */ -#line 16587 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16592 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_ONE_PHASE; } break; case 2664: /* Line 1792 of yacc.c */ -#line 16592 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16597 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_NONE; } break; case 2665: /* Line 1792 of yacc.c */ -#line 16594 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16599 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_SUSPEND; } break; case 2667: /* Line 1792 of yacc.c */ -#line 16599 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16604 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" {} break; case 2668: /* Line 1792 of yacc.c */ -#line 16600 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16605 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { Lex->xa_opt=XA_FOR_MIGRATE; } break; case 2669: /* Line 1792 of yacc.c */ -#line 16605 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16610 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_INSTALL_PLUGIN; @@ -39870,7 +39875,7 @@ case 2670: /* Line 1792 of yacc.c */ -#line 16615 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 16620 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" { LEX *lex= Lex; lex->sql_command= SQLCOM_UNINSTALL_PLUGIN; @@ -39880,7 +39885,7 @@ /* Line 1792 of yacc.c */ -#line 39884 "/export/home/pb2/build/sb_0-18927995-1463437275.62/dist_GPL/sql/sql_yacc.cc" +#line 39889 "/export/home/pb2/build/sb_0-20199989-1472210623.26/dist_GPL/sql/sql_yacc.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires diff -Nru mysql-5.6-5.6.31/sql/sql_yacc.h mysql-5.6-5.6.33/sql/sql_yacc.h --- mysql-5.6-5.6.31/sql/sql_yacc.h 2016-05-16 22:26:24.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_yacc.h 2016-08-26 11:33:03.000000000 +0000 @@ -30,8 +30,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED -# define YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED +#ifndef YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED +# define YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -1292,7 +1292,7 @@ typedef union YYSTYPE { /* Line 2058 of yacc.c */ -#line 968 "/export/home/pb2/build/sb_0-18927995-1463437275.62/mysql-5.6.31-release-export-9442321_gpl/sql/sql_yacc.yy" +#line 968 "/export/home/pb2/build/sb_0-20199989-1472210623.26/mysql-5.6.33-release-export-9935476_gpl/sql/sql_yacc.yy" int num; ulong ulong_num; @@ -1352,7 +1352,7 @@ /* Line 2058 of yacc.c */ -#line 1356 "/export/home/pb2/build/sb_0-18927995-1463437275.62/dist_GPL/sql/sql_yacc.h" +#line 1356 "/export/home/pb2/build/sb_0-20199989-1472210623.26/dist_GPL/sql/sql_yacc.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -1374,4 +1374,4 @@ #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_18927995_1463437275_62_DIST_GPL_SQL_SQL_YACC_H_INCLUDED */ +#endif /* !YY_MYSQL_EXPORT_HOME_PB2_BUILD_SB_0_20199989_1472210623_26_DIST_GPL_SQL_SQL_YACC_H_INCLUDED */ diff -Nru mysql-5.6-5.6.31/sql/sql_yacc.yy mysql-5.6-5.6.33/sql/sql_yacc.yy --- mysql-5.6-5.6.31/sql/sql_yacc.yy 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sql_yacc.yy 2016-08-26 11:22:35.000000000 +0000 @@ -2515,6 +2515,11 @@ ident_or_text OPTIONS_SYM '(' server_options_list ')' { + if ($2.length == 0) + { + my_error(ER_WRONG_VALUE, MYF(0), "server name", ""); + MYSQL_YYABORT; + } Lex->server_options.server_name= $2.str; Lex->server_options.server_name_length= $2.length; Lex->server_options.scheme= $6.str; diff -Nru mysql-5.6-5.6.31/sql/sys_vars.cc mysql-5.6-5.6.33/sql/sys_vars.cc --- mysql-5.6-5.6.31/sql/sys_vars.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/sys_vars.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3682,6 +3682,14 @@ if (!var->save_result.string_value.str) return true; + if (!is_valid_log_name(var->save_result.string_value.str, + var->save_result.string_value.length)) + { + my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), + self->name.str, var->save_result.string_value.str); + return true; + } + if (var->save_result.string_value.length > FN_REFLEN) { // path is too long my_error(ER_PATH_LENGTH, MYF(0), self->name.str); @@ -3728,7 +3736,7 @@ return false; } static bool fix_log(char** logname, const char* default_logname, - const char*ext, bool enabled, void (*reopen)(char*)) + const char*ext, bool enabled, bool (*reopen)(char*)) { if (!*logname) // SET ... = DEFAULT { @@ -3740,16 +3748,17 @@ } logger.lock_exclusive(); mysql_mutex_unlock(&LOCK_global_system_variables); + bool error= false; if (enabled) - reopen(*logname); + error= reopen(*logname); logger.unlock(); mysql_mutex_lock(&LOCK_global_system_variables); - return false; + return error; } -static void reopen_general_log(char* name) +static bool reopen_general_log(char* name) { logger.get_log_file_handler()->close(0); - logger.get_log_file_handler()->open_query_log(name); + return logger.get_log_file_handler()->open_query_log(name); } static bool fix_general_log_file(sys_var *self, THD *thd, enum_var_type type) { @@ -3762,10 +3771,10 @@ IN_FS_CHARSET, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_log_path), ON_UPDATE(fix_general_log_file)); -static void reopen_slow_log(char* name) +static bool reopen_slow_log(char* name) { logger.get_slow_log_file_handler()->close(0); - logger.get_slow_log_file_handler()->open_slow_log(name); + return logger.get_slow_log_file_handler()->open_slow_log(name); } static bool fix_slow_log_file(sys_var *self, THD *thd, enum_var_type type) { diff -Nru mysql-5.6-5.6.31/sql/table.cc mysql-5.6-5.6.33/sql/table.cc --- mysql-5.6-5.6.31/sql/table.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/table.cc 2016-08-26 11:22:35.000000000 +0000 @@ -5344,12 +5344,14 @@ @brief Mark columns needed for doing an update of a row + @param mark_binlog_columns if true, mark columns as per binlog_row_image + requirements. @details Some engines needs to have all columns in an update (to be able to build a complete row). If this is the case, we mark all not updated columns to be read. - If this is no the case, we do like in the delete case and mark + If this is not the case, we do like in the delete case and mark if neeed, either the primary key column or all columns to be read. (see mark_columns_needed_for_delete() for details) @@ -5357,17 +5359,30 @@ mark all USED key columns as 'to-be-read'. This allows the engine to loop over the given record to find all changed keys and doesn't have to retrieve the row again. - + Unlike other similar methods, it doesn't mark fields used by triggers, that is the responsibility of the caller to do, by using Table_triggers_list::mark_used_fields(TRG_EVENT_UPDATE)! + + Note: Marking additional columns as per binlog_row_image requirements will + influence query execution plan. For example in the case of + binlog_row_image=FULL the entire read_set and write_set needs to be flagged. + This will influence update query to think that 'used key is being modified' + and query will create a temporary table to process the update operation. + Which will result in performance degradation. Hence callers who don't want + their query execution to be influenced as per binlog_row_image requirements + can skip marking binlog specific columns here and they should make an + explicit call to 'mark_columns_per_binlog_row_image()' function to mark + binlog_row_image specific columns. */ -void TABLE::mark_columns_needed_for_update() +void TABLE::mark_columns_needed_for_update(bool mark_binlog_columns) { DBUG_ENTER("mark_columns_needed_for_update"); - mark_columns_per_binlog_row_image(); + + if (mark_binlog_columns) + mark_columns_per_binlog_row_image(); if (file->ha_table_flags() & HA_REQUIRES_KEY_COLUMNS_FOR_DELETE) { /* Mark all used key columns for read */ diff -Nru mysql-5.6-5.6.31/sql/table.h mysql-5.6-5.6.33/sql/table.h --- mysql-5.6-5.6.31/sql/table.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/sql/table.h 2016-08-26 11:22:35.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef TABLE_INCLUDED #define TABLE_INCLUDED -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1216,7 +1216,7 @@ void mark_columns_used_by_index_no_reset(uint index, MY_BITMAP *map); void mark_columns_used_by_index(uint index); void mark_auto_increment_column(void); - void mark_columns_needed_for_update(void); + void mark_columns_needed_for_update(bool mark_binlog_columns); void mark_columns_needed_for_delete(void); void mark_columns_needed_for_insert(void); void mark_columns_per_binlog_row_image(void); diff -Nru mysql-5.6-5.6.31/storage/innobase/fts/fts0fts.cc mysql-5.6-5.6.33/storage/innobase/fts/fts0fts.cc --- mysql-5.6-5.6.31/storage/innobase/fts/fts0fts.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/fts/fts0fts.cc 2016-08-26 11:22:35.000000000 +0000 @@ -108,6 +108,7 @@ /** variable to record innodb_fts_internal_tbl_name for information schema table INNODB_FTS_INSERTED etc. */ UNIV_INTERN char* fts_internal_tbl_name = NULL; +UNIV_INTERN char* fts_internal_tbl_name2 = NULL; /** InnoDB default stopword list: There are different versions of stopwords, the stop words listed @@ -265,13 +266,15 @@ @param[in,out] sync sync state @param[in] unlock_cache whether unlock cache lock when write node @param[in] wait whether wait when a sync is in progress +@param[in] has_dict whether has dict operation lock @return DB_SUCCESS if all OK */ static dberr_t fts_sync( fts_sync_t* sync, bool unlock_cache, - bool wait); + bool wait, + bool has_dict); /****************************************************************//** Release all resources help by the words rb tree e.g., the node ilist. */ @@ -3566,7 +3569,7 @@ DBUG_EXECUTE_IF( "fts_instrument_sync_debug", - fts_sync(cache->sync, true, true); + fts_sync(cache->sync, true, true, false); ); DEBUG_SYNC_C("fts_instrument_sync_request"); @@ -4378,13 +4381,11 @@ } /** Check if index cache has been synced completely -@param[in,out] sync sync state @param[in,out] index_cache index cache @return true if index is synced, otherwise false. */ static bool fts_sync_index_check( - fts_sync_t* sync, fts_index_cache_t* index_cache) { const ib_rbt_node_t* rbt_node; @@ -4407,14 +4408,36 @@ return(true); } -/*********************************************************************//** -Commit the SYNC, change state of processed doc ids etc. +/** Reset synced flag in index cache when rollback +@param[in,out] index_cache index cache */ +static +void +fts_sync_index_reset( + fts_index_cache_t* index_cache) +{ + const ib_rbt_node_t* rbt_node; + + for (rbt_node = rbt_first(index_cache->words); + rbt_node != NULL; + rbt_node = rbt_next(index_cache->words, rbt_node)) { + + fts_tokenizer_word_t* word; + word = rbt_value(fts_tokenizer_word_t, rbt_node); + + fts_node_t* fts_node; + fts_node = static_cast(ib_vector_last(word->nodes)); + + fts_node->synced = false; + } +} + +/** Commit the SYNC, change state of processed doc ids etc. +@param[in,out] sync sync state @return DB_SUCCESS if all OK */ static MY_ATTRIBUTE((nonnull, warn_unused_result)) dberr_t fts_sync_commit( -/*============*/ - fts_sync_t* sync) /*!< in: sync state */ + fts_sync_t* sync) { dberr_t error; trx_t* trx = sync->trx; @@ -4467,6 +4490,8 @@ (double) n_nodes/ (double) elapsed_time); } + /* Avoid assertion in trx_free(). */ + trx->dict_operation_lock_mode = 0; trx_free_for_background(trx); return(error); @@ -4489,6 +4514,10 @@ index_cache = static_cast( ib_vector_get(cache->indexes, i)); + /* Reset synced flag so nodes will not be skipped + in the next sync, see fts_sync_write_words(). */ + fts_sync_index_reset(index_cache); + for (j = 0; fts_index_selector[j].value; ++j) { if (index_cache->ins_graph[j] != NULL) { @@ -4514,6 +4543,9 @@ rw_lock_x_unlock(&cache->lock); fts_sql_rollback(trx); + + /* Avoid assertion in trx_free(). */ + trx->dict_operation_lock_mode = 0; trx_free_for_background(trx); } @@ -4522,13 +4554,15 @@ @param[in,out] sync sync state @param[in] unlock_cache whether unlock cache lock when write node @param[in] wait whether wait when a sync is in progress +@param[in] has_dict whether has dict operation lock @return DB_SUCCESS if all OK */ static dberr_t fts_sync( fts_sync_t* sync, bool unlock_cache, - bool wait) + bool wait, + bool has_dict) { ulint i; dberr_t error = DB_SUCCESS; @@ -4557,6 +4591,12 @@ DEBUG_SYNC_C("fts_sync_begin"); fts_sync_begin(sync); + /* When sync in background, we hold dict operation lock + to prevent DDL like DROP INDEX, etc. */ + if (has_dict) { + sync->trx->dict_operation_lock_mode = RW_S_LATCH; + } + begin_sync: if (cache->total_size > fts_max_cache_size) { /* Avoid the case: sync never finish when @@ -4597,7 +4637,7 @@ ib_vector_get(cache->indexes, i)); if (index_cache->index->to_be_dropped - || fts_sync_index_check(sync, index_cache)) { + || fts_sync_index_check(index_cache)) { continue; } @@ -4612,6 +4652,7 @@ } rw_lock_x_lock(&cache->lock); + sync->interrupted = false; sync->in_progress = false; os_event_set(sync->event); rw_lock_x_unlock(&cache->lock); @@ -4635,20 +4676,23 @@ @param[in,out] table fts table @param[in] unlock_cache whether unlock cache when write node @param[in] wait whether wait for existing sync to finish +@param[in] has_dict whether has dict operation lock @return DB_SUCCESS on success, error code on failure. */ UNIV_INTERN dberr_t fts_sync_table( dict_table_t* table, bool unlock_cache, - bool wait) + bool wait, + bool has_dict) { dberr_t err = DB_SUCCESS; ut_ad(table->fts); if (!dict_table_is_discarded(table) && table->fts->cache) { - err = fts_sync(table->fts->cache->sync, unlock_cache, wait); + err = fts_sync(table->fts->cache->sync, + unlock_cache, wait, has_dict); } return(err); @@ -6526,6 +6570,36 @@ return(0); } +/* Get parent table name if it's a fts aux table +@param[in] aux_table_name aux table name +@param[in] aux_table_len aux table length +@return parent table name, or NULL */ +char* +fts_get_parent_table_name( + const char* aux_table_name, + ulint aux_table_len) +{ + fts_aux_table_t aux_table; + char* parent_table_name = NULL; + + if (fts_is_aux_table_name(&aux_table, aux_table_name, aux_table_len)) { + dict_table_t* parent_table; + + parent_table = dict_table_open_on_id( + aux_table.parent_id, TRUE, DICT_TABLE_OP_NORMAL); + + if (parent_table != NULL) { + parent_table_name = mem_strdupl( + parent_table->name, + strlen(parent_table->name)); + + dict_table_close(parent_table, TRUE, FALSE); + } + } + + return(parent_table_name); +} + /** Check the validity of the parent table. @param[in] aux_table auxiliary table @return true if it is a valid table or false if it is not */ diff -Nru mysql-5.6-5.6.31/storage/innobase/fts/fts0opt.cc mysql-5.6-5.6.33/storage/innobase/fts/fts0opt.cc --- mysql-5.6-5.6.31/storage/innobase/fts/fts0opt.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/fts/fts0opt.cc 2016-08-26 11:22:35.000000000 +0000 @@ -2986,7 +2986,7 @@ if (table) { if (dict_table_has_fts_index(table) && table->fts->cache) { - fts_sync_table(table, true, false); + fts_sync_table(table, true, false, true); } dict_table_close(table, FALSE, FALSE); diff -Nru mysql-5.6-5.6.31/storage/innobase/handler/ha_innodb.cc mysql-5.6-5.6.33/storage/innobase/handler/ha_innodb.cc --- mysql-5.6-5.6.31/storage/innobase/handler/ha_innodb.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/handler/ha_innodb.cc 2016-08-26 11:22:35.000000000 +0000 @@ -6529,6 +6529,7 @@ ha_innobase::innobase_lock_autoinc(void) /*====================================*/ { + DBUG_ENTER("ha_innobase::innobase_lock_autoinc"); dberr_t error = DB_SUCCESS; ut_ad(!srv_read_only_mode); @@ -6563,6 +6564,8 @@ /* Fall through to old style locking. */ case AUTOINC_OLD_STYLE_LOCKING: + DBUG_EXECUTE_IF("die_if_autoinc_old_lock_style_used", + ut_ad(0);); error = row_lock_table_autoinc_for_mysql(prebuilt); if (error == DB_SUCCESS) { @@ -6576,7 +6579,7 @@ ut_error; } - return(error); + DBUG_RETURN(error); } /********************************************************************//** @@ -11392,7 +11395,7 @@ if (innodb_optimize_fulltext_only) { if (prebuilt->table->fts && prebuilt->table->fts->cache && !dict_table_is_discarded(prebuilt->table)) { - fts_sync_table(prebuilt->table, false, true); + fts_sync_table(prebuilt->table, false, true, false); fts_optimize_table(prebuilt->table); } return(HA_ADMIN_OK); @@ -14502,7 +14505,12 @@ my_free(old); } - fts_internal_tbl_name = *(char**) var_ptr; + fts_internal_tbl_name2 = *(char**) var_ptr; + if (fts_internal_tbl_name2 == NULL) { + fts_internal_tbl_name = const_cast("default"); + } else { + fts_internal_tbl_name = fts_internal_tbl_name2; + } } /****************************************************************//** @@ -16250,7 +16258,7 @@ "Whether to disable OS system file cache for sort I/O", NULL, NULL, FALSE); -static MYSQL_SYSVAR_STR(ft_aux_table, fts_internal_tbl_name, +static MYSQL_SYSVAR_STR(ft_aux_table, fts_internal_tbl_name2, PLUGIN_VAR_NOCMDARG, "FTS internal auxiliary table to be checked", innodb_internal_table_validate, diff -Nru mysql-5.6-5.6.31/storage/innobase/handler/handler0alter.cc mysql-5.6-5.6.33/storage/innobase/handler/handler0alter.cc --- mysql-5.6-5.6.31/storage/innobase/handler/handler0alter.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/handler/handler0alter.cc 2016-08-26 11:22:35.000000000 +0000 @@ -201,7 +201,10 @@ /*==================*/ const Alter_inplace_info* ha_alter_info) { - if (ha_alter_info->handler_flags + Alter_inplace_info::HA_ALTER_FLAGS alter_inplace_flags = + ha_alter_info->handler_flags & ~(INNOBASE_INPLACE_IGNORE); + + if (alter_inplace_flags == Alter_inplace_info::CHANGE_CREATE_OPTION && !(ha_alter_info->create_info->used_fields & (HA_CREATE_USED_ROW_FORMAT @@ -3760,7 +3763,7 @@ } if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA) - || (ha_alter_info->handler_flags + || ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) == Alter_inplace_info::CHANGE_CREATE_OPTION && !innobase_need_rebuild(ha_alter_info))) { @@ -3926,7 +3929,7 @@ DBUG_RETURN(false); } - if (ha_alter_info->handler_flags + if ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) == Alter_inplace_info::CHANGE_CREATE_OPTION && !innobase_need_rebuild(ha_alter_info)) { goto ok_exit; diff -Nru mysql-5.6-5.6.31/storage/innobase/handler/i_s.cc mysql-5.6-5.6.33/storage/innobase/handler/i_s.cc --- mysql-5.6-5.6.31/storage/innobase/handler/i_s.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/handler/i_s.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -3004,15 +3004,26 @@ DBUG_RETURN(0); } - deleted = fts_doc_ids_create(); + /* Prevent DDL to drop fts aux tables. */ + rw_lock_s_lock(&dict_operation_lock); user_table = dict_table_open_on_name( fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE); if (!user_table) { + rw_lock_s_unlock(&dict_operation_lock); + + DBUG_RETURN(0); + } else if (!dict_table_has_fts_index(user_table)) { + dict_table_close(user_table, FALSE, FALSE); + + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } + deleted = fts_doc_ids_create(); + trx = trx_allocate_for_background(); trx->op_info = "Select for FTS DELETE TABLE"; @@ -3040,6 +3051,8 @@ dict_table_close(user_table, FALSE, FALSE); + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } @@ -3421,6 +3434,12 @@ DBUG_RETURN(0); } + if (user_table->fts == NULL || user_table->fts->cache == NULL) { + dict_table_close(user_table, FALSE, FALSE); + + DBUG_RETURN(0); + } + cache = user_table->fts->cache; ut_a(cache); @@ -3859,10 +3878,15 @@ DBUG_RETURN(0); } + /* Prevent DDL to drop fts aux tables. */ + rw_lock_s_lock(&dict_operation_lock); + user_table = dict_table_open_on_name( fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE); if (!user_table) { + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } @@ -3875,6 +3899,8 @@ dict_table_close(user_table, FALSE, FALSE); + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } @@ -4012,16 +4038,25 @@ DBUG_RETURN(0); } + DEBUG_SYNC_C("i_s_fts_config_fille_check"); + fields = table->field; + /* Prevent DDL to drop fts aux tables. */ + rw_lock_s_lock(&dict_operation_lock); + user_table = dict_table_open_on_name( fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE); if (!user_table) { + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } else if (!dict_table_has_fts_index(user_table)) { dict_table_close(user_table, FALSE, FALSE); + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } @@ -4077,6 +4112,8 @@ dict_table_close(user_table, FALSE, FALSE); + rw_lock_s_unlock(&dict_operation_lock); + DBUG_RETURN(0); } diff -Nru mysql-5.6-5.6.31/storage/innobase/include/fts0fts.h mysql-5.6-5.6.33/storage/innobase/include/fts0fts.h --- mysql-5.6-5.6.31/storage/innobase/include/fts0fts.h 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/include/fts0fts.h 2016-08-26 11:22:35.000000000 +0000 @@ -375,6 +375,7 @@ /** Variable specifying the table that has Fulltext index to display its content through information schema table */ extern char* fts_internal_tbl_name; +extern char* fts_internal_tbl_name2; #define fts_que_graph_free(graph) \ do { \ @@ -823,6 +824,15 @@ fts_drop_orphaned_tables(void); /*==========================*/ +/* Get parent table name if it's a fts aux table +@param[in] aux_table_name aux table name +@param[in] aux_table_len aux table length +@return parent table name, or NULL */ +char* +fts_get_parent_table_name( + const char* aux_table_name, + ulint aux_table_len); + /******************************************************************//** Since we do a horizontal split on the index table, we need to drop all the split tables. @@ -840,13 +850,15 @@ @param[in,out] table fts table @param[in] unlock_cache whether unlock cache when write node @param[in] wait whether wait for existing sync to finish +@param[in] has_dict whether has dict operation lock @return DB_SUCCESS on success, error code on failure. */ UNIV_INTERN dberr_t fts_sync_table( dict_table_t* table, bool unlock_cache, - bool wait); + bool wait, + bool has_dict); /****************************************************************//** Free the query graph but check whether dict_sys->mutex is already diff -Nru mysql-5.6-5.6.31/storage/innobase/row/row0log.cc mysql-5.6-5.6.33/storage/innobase/row/row0log.cc --- mysql-5.6-5.6.31/storage/innobase/row/row0log.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/row/row0log.cc 2016-08-26 11:22:35.000000000 +0000 @@ -613,7 +613,7 @@ &old_pk_extra_size); ut_ad(old_pk_extra_size < 0x100); - mrec_size = 4 + old_pk_size; + mrec_size = 6 + old_pk_size; /* Log enough prefix of the BLOB unless both the old and new table are in COMPACT or REDUNDANT format, @@ -643,8 +643,8 @@ *b++ = static_cast(old_pk_extra_size); /* Log the size of external prefix we saved */ - mach_write_to_2(b, ext_size); - b += 2; + mach_write_to_4(b, ext_size); + b += 4; rec_convert_dtuple_to_temp( b + old_pk_extra_size, new_index, @@ -2268,14 +2268,14 @@ break; case ROW_T_DELETE: - /* 1 (extra_size) + 2 (ext_size) + at least 1 (payload) */ - if (mrec + 4 >= mrec_end) { + /* 1 (extra_size) + 4 (ext_size) + at least 1 (payload) */ + if (mrec + 6 >= mrec_end) { return(NULL); } extra_size = *mrec++; - ext_size = mach_read_from_2(mrec); - mrec += 2; + ext_size = mach_read_from_4(mrec); + mrec += 4; ut_ad(mrec < mrec_end); /* We assume extra_size < 0x100 for the PRIMARY KEY prefix. diff -Nru mysql-5.6-5.6.31/storage/innobase/row/row0merge.cc mysql-5.6-5.6.33/storage/innobase/row/row0merge.cc --- mysql-5.6-5.6.31/storage/innobase/row/row0merge.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/row/row0merge.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1987,7 +1987,7 @@ /* Sync fts cache for other fts indexes to keep all fts indexes consistent in sync_doc_id. */ err = fts_sync_table(const_cast(new_table), - false, true); + false, true, false); if (err == DB_SUCCESS) { fts_update_next_doc_id( diff -Nru mysql-5.6-5.6.31/storage/innobase/row/row0mysql.cc mysql-5.6-5.6.33/storage/innobase/row/row0mysql.cc --- mysql-5.6-5.6.31/storage/innobase/row/row0mysql.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/row/row0mysql.cc 2016-08-26 11:22:35.000000000 +0000 @@ -2676,6 +2676,10 @@ return(n_tables + n_tables_dropped); } + DBUG_EXECUTE_IF("row_drop_tables_in_background_sleep", + os_thread_sleep(5000000); + ); + table = dict_table_open_on_name(drop->table_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE); @@ -2686,6 +2690,16 @@ goto already_dropped; } + if (!table->to_be_dropped) { + /* There is a scenario: the old table is dropped + just after it's added into drop list, and new + table with the same name is created, then we try + to drop the new table in background. */ + dict_table_close(table, FALSE, FALSE); + + goto already_dropped; + } + ut_a(!table->can_be_evicted); dict_table_close(table, FALSE, FALSE); @@ -3945,6 +3959,13 @@ } } + + DBUG_EXECUTE_IF("row_drop_table_add_to_background", + row_add_table_to_background_drop_list(table->name); + err = DB_SUCCESS; + goto funct_exit; + ); + /* TODO: could we replace the counter n_foreign_key_checks_running with lock checks on the table? Acquire here an exclusive lock on the table, and rewrite lock0lock.cc and the lock wait in srv0srv.cc so that @@ -4561,6 +4582,19 @@ row_mysql_lock_data_dictionary(trx); while ((table_name = dict_get_first_table_name_in_db(name))) { + /* Drop parent table if it is a fts aux table, to + avoid accessing dropped fts aux tables in information + scheam when parent table still exists. + Note: Drop parent table will drop fts aux tables. */ + char* parent_table_name; + parent_table_name = fts_get_parent_table_name( + table_name, strlen(table_name)); + + if (parent_table_name != NULL) { + mem_free(table_name); + table_name = parent_table_name; + } + ut_a(memcmp(table_name, name, namelen) == 0); table = dict_table_open_on_name( diff -Nru mysql-5.6-5.6.31/storage/innobase/srv/srv0mon.cc mysql-5.6-5.6.33/storage/innobase/srv/srv0mon.cc --- mysql-5.6-5.6.31/storage/innobase/srv/srv0mon.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/innobase/srv/srv0mon.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2010, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. This program is free software; you can redistribute it and/or modify it under @@ -1347,7 +1347,10 @@ module */ set_current_module = FALSE; } else if (module_id == MONITOR_ALL_COUNTER) { - continue; + if (!(innodb_counter_info[ix].monitor_type + & MONITOR_GROUP_MODULE)) { + continue; + } } else { /* Hitting the next module, stop */ break; diff -Nru mysql-5.6-5.6.31/storage/myisam/ha_myisam.cc mysql-5.6-5.6.33/storage/myisam/ha_myisam.cc --- mysql-5.6-5.6.31/storage/myisam/ha_myisam.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/myisam/ha_myisam.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1089,24 +1089,36 @@ /* TODO: respect myisam_repair_threads variable */ my_snprintf(buf, 40, "Repair with %d threads", my_count_bits(key_map)); thd_proc_info(thd, buf); + /* + The new file is created with the right stats, so we can skip + copying file stats from old to new. + */ error = mi_repair_parallel(¶m, file, fixed_name, - param.testflag & T_QUICK); + param.testflag & T_QUICK, TRUE); thd_proc_info(thd, "Repair done"); // to reset proc_info, as // it was pointing to local buffer } else { thd_proc_info(thd, "Repair by sorting"); + /* + The new file is created with the right stats, so we can skip + copying file stats from old to new. + */ error = mi_repair_by_sort(¶m, file, fixed_name, - param.testflag & T_QUICK); + param.testflag & T_QUICK, TRUE); } } else { thd_proc_info(thd, "Repair with keycache"); param.testflag &= ~T_REP_BY_SORT; + /* + The new file is created with the right stats, so we can skip + copying file stats from old to new. + */ error= mi_repair(¶m, file, fixed_name, - param.testflag & T_QUICK); + param.testflag & T_QUICK, TRUE); } #ifdef HAVE_MMAP if (remap) @@ -1122,7 +1134,11 @@ { optimize_done=1; thd_proc_info(thd, "Sorting index"); - error=mi_sort_index(¶m,file,fixed_name); + /* + The new file is created with the right stats, so we can skip + copying file stats from old to new. + */ + error=mi_sort_index(¶m,file,fixed_name, TRUE); } if (!statistics_done && (local_testflag & T_STATISTICS)) { diff -Nru mysql-5.6-5.6.31/storage/myisam/mi_check.c mysql-5.6-5.6.33/storage/myisam/mi_check.c --- mysql-5.6-5.6.31/storage/myisam/mi_check.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/myisam/mi_check.c 2016-08-26 11:22:35.000000000 +0000 @@ -1512,7 +1512,7 @@ /* Save new datafile-name in temp_filename */ int mi_repair(MI_CHECK *param, register MI_INFO *info, - char * name, int rep_quick) + char * name, int rep_quick, my_bool no_copy_stat) { int error,got_error; ha_rows start_records,new_header_length; @@ -1726,6 +1726,11 @@ /* Replace the actual file with the temporary file */ if (new_file >= 0) { + myf flags= 0; + if (param->testflag & T_BACKUP_DATA) + flags |= MY_REDEL_MAKE_BACKUP; + if (no_copy_stat) + flags |= MY_REDEL_NO_COPY_STAT; mysql_file_close(new_file, MYF(0)); info->dfile=new_file= -1; /* @@ -1744,8 +1749,7 @@ info->s->file_map= NULL; } if (change_to_newfile(share->data_file_name, MI_NAME_DEXT, DATA_TMP_EXT, - (param->testflag & T_BACKUP_DATA ? - MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || + flags) || mi_open_datafile(info,share,name,-1)) got_error=1; @@ -1933,7 +1937,8 @@ /* Sort index for more efficent reads */ -int mi_sort_index(MI_CHECK *param, register MI_INFO *info, char * name) +int mi_sort_index(MI_CHECK *param, register MI_INFO *info, char * name, + my_bool no_copy_stat) { reg2 uint key; reg1 MI_KEYDEF *keyinfo; @@ -2010,7 +2015,7 @@ share->kfile = -1; (void) mysql_file_close(new_file, MYF(MY_WME)); if (change_to_newfile(share->index_file_name, MI_NAME_IEXT, INDEX_TMP_EXT, - MYF(0)) || + no_copy_stat ? MYF(MY_REDEL_NO_COPY_STAT) : MYF(0)) || mi_open_keyfile(share)) goto err2; info->lock_type= F_UNLCK; /* Force mi_readinfo to lock */ @@ -2215,6 +2220,8 @@ info MyISAM handler to repair name Name of table (for warnings) rep_quick set to <> 0 if we should not change data file + no_copy_stat Don't copy file stats from old to new file, + assume that new file was created with correct stats RESULT 0 ok @@ -2222,7 +2229,7 @@ */ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, - const char * name, int rep_quick) + const char * name, int rep_quick, my_bool no_copy_stat) { int got_error; uint i; @@ -2549,11 +2556,15 @@ /* Replace the actual file with the temporary file */ if (new_file >= 0) { + myf flags= 0; + if (param->testflag & T_BACKUP_DATA) + flags |= MY_REDEL_MAKE_BACKUP; + if (no_copy_stat) + flags |= MY_REDEL_NO_COPY_STAT; mysql_file_close(new_file, MYF(0)); info->dfile=new_file= -1; if (change_to_newfile(share->data_file_name,MI_NAME_DEXT, DATA_TMP_EXT, - (param->testflag & T_BACKUP_DATA ? - MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || + flags) || mi_open_datafile(info,share,name,-1)) got_error=1; } @@ -2601,6 +2612,8 @@ info MyISAM handler to repair name Name of table (for warnings) rep_quick set to <> 0 if we should not change data file + no_copy_stat Don't copy file stats from old to new file, + assume that new file was created with correct stats DESCRIPTION Same as mi_repair_by_sort but do it multithreaded @@ -2635,7 +2648,7 @@ */ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, - const char * name, int rep_quick) + const char * name, int rep_quick, my_bool no_copy_stat) { int got_error; uint i,key, total_key_length, istep; @@ -3082,11 +3095,15 @@ /* Replace the actual file with the temporary file */ if (new_file >= 0) { + myf flags= 0; + if (param->testflag & T_BACKUP_DATA) + flags |= MY_REDEL_MAKE_BACKUP; + if (no_copy_stat) + flags |= MY_REDEL_NO_COPY_STAT; mysql_file_close(new_file, MYF(0)); info->dfile=new_file= -1; if (change_to_newfile(share->data_file_name, MI_NAME_DEXT, DATA_TMP_EXT, - (param->testflag & T_BACKUP_DATA ? - MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || + flags) || mi_open_datafile(info,share,name,-1)) got_error=1; } diff -Nru mysql-5.6-5.6.31/storage/myisam/myisamchk.c mysql-5.6-5.6.33/storage/myisam/myisamchk.c --- mysql-5.6-5.6.31/storage/myisam/myisamchk.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/myisam/myisamchk.c 2016-08-26 11:22:35.000000000 +0000 @@ -994,14 +994,18 @@ info->s->state.key_map, param->force_sort)) { + /* + The new file might not be created with the right stats depending + on how myisamchk is run, so we must copy file stats from old to new. + */ if (param->testflag & T_REP_BY_SORT) - error=mi_repair_by_sort(param,info,filename,rep_quick); + error= mi_repair_by_sort(param, info, filename, rep_quick, FALSE); else - error=mi_repair_parallel(param,info,filename,rep_quick); + error= mi_repair_parallel(param, info, filename, rep_quick, FALSE); state_updated=1; } else if (param->testflag & T_REP_ANY) - error=mi_repair(param, info,filename,rep_quick); + error= mi_repair(param, info, filename, rep_quick, FALSE); } if (!error && param->testflag & T_SORT_RECORDS) { @@ -1041,12 +1045,12 @@ { if (param->verbose) puts("Table had a compressed index; We must now recreate the index"); - error=mi_repair_by_sort(param,info,filename,1); + error= mi_repair_by_sort(param, info, filename, 1, FALSE); } } } if (!error && param->testflag & T_SORT_INDEX) - error=mi_sort_index(param,info,filename); + error= mi_sort_index(param, info, filename, FALSE); if (!error) share->state.changed&= ~(STATE_CHANGED | STATE_CRASHED | STATE_CRASHED_ON_REPAIR); diff -Nru mysql-5.6-5.6.31/storage/perfschema/table_events_statements.cc mysql-5.6-5.6.33/storage/perfschema/table_events_statements.cc --- mysql-5.6-5.6.31/storage/perfschema/table_events_statements.cc 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/storage/perfschema/table_events_statements.cc 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -340,11 +340,17 @@ CHARSET_INFO *cs= get_charset(statement->m_sqltext_cs_number, MYF(0)); size_t valid_length= statement->m_sqltext_length; - if (cs->mbmaxlen > 1) + if (cs != NULL) { - int well_formed_error; - valid_length= cs->cset->well_formed_len(cs, statement->m_sqltext, statement->m_sqltext + valid_length, - valid_length, &well_formed_error); + if (cs->mbmaxlen > 1) + { + int well_formed_error; + valid_length= cs->cset->well_formed_len(cs, + statement->m_sqltext, + statement->m_sqltext + valid_length, + valid_length, + &well_formed_error); + } } m_row.m_sqltext.set_charset(cs); diff -Nru mysql-5.6-5.6.31/support-files/mysql.5.6.31.spec mysql-5.6-5.6.33/support-files/mysql.5.6.31.spec --- mysql-5.6-5.6.31/support-files/mysql.5.6.31.spec 2016-05-16 22:26:16.000000000 +0000 +++ mysql-5.6-5.6.33/support-files/mysql.5.6.31.spec 1970-01-01 00:00:00.000000000 +0000 @@ -1,2103 +0,0 @@ -# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston -# MA 02110-1301 USA. - -############################################################################## -# Some common macro definitions -############################################################################## - -# NOTE: "vendor" is used in upgrade/downgrade check, so you can't -# change these, has to be exactly as is. -%global mysql_old_vendor MySQL AB -%global mysql_vendor_2 Sun Microsystems, Inc. -%global mysql_vendor Oracle and/or its affiliates - -%global mysql_version 5.6.31 - -%global mysqld_user mysql -%global mysqld_group mysql -%global mysqldatadir /var/lib/mysql - -%global release 1 - - -# -# Macros we use which are not available in all supported versions of RPM -# -# - defined/undefined are missing on RHEL4 -# -%if %{expand:%{?defined:0}%{!?defined:1}} -%define defined() %{expand:%%{?%{1}:1}%%{!?%{1}:0}} -%endif -%if %{expand:%{?undefined:0}%{!?undefined:1}} -%define undefined() %{expand:%%{?%{1}:0}%%{!?%{1}:1}} -%endif - -# ---------------------------------------------------------------------------- -# RPM build tools now automatically detect Perl module dependencies. This -# detection causes problems as it is broken in some versions, and it also -# provides unwanted dependencies from mandatory scripts in our package. -# It might not be possible to disable this in all versions of RPM, but here we -# try anyway. We keep the "AutoReqProv: no" for the "test" sub package, as -# disabling here might fail, and that package has the most problems. -# See: -# http://fedoraproject.org/wiki/Packaging/Perl#Filtering_Requires:_and_Provides -# http://www.wideopen.com/archives/rpm-list/2002-October/msg00343.html -# ---------------------------------------------------------------------------- -%undefine __perl_provides -%undefine __perl_requires - -############################################################################## -# Command line handling -############################################################################## -# -# To set options: -# -# $ rpmbuild --define="option " ... -# - -# ---------------------------------------------------------------------------- -# Commercial builds -# ---------------------------------------------------------------------------- -%if %{undefined commercial} -%define commercial 0 -%endif - -# ---------------------------------------------------------------------------- -# Source name -# ---------------------------------------------------------------------------- -%if %{undefined src_base} -%define src_base mysql -%endif -%define src_dir %{src_base}-%{mysql_version} - -# ---------------------------------------------------------------------------- -# Feature set (storage engines, options). Default to community (everything) -# ---------------------------------------------------------------------------- -%if %{undefined feature_set} -%define feature_set community -%endif - -# ---------------------------------------------------------------------------- -# Server comment strings -# ---------------------------------------------------------------------------- -%if %{undefined compilation_comment_debug} -%define compilation_comment_debug MySQL Community Server - Debug (GPL) -%endif -%if %{undefined compilation_comment_release} -%define compilation_comment_release MySQL Community Server (GPL) -%endif - -# ---------------------------------------------------------------------------- -# Product and server suffixes -# ---------------------------------------------------------------------------- -%if %{undefined product_suffix} - %if %{defined short_product_tag} - %define product_suffix -%{short_product_tag} - %else - %define product_suffix %{nil} - %endif -%endif - -%if %{undefined server_suffix} -%define server_suffix %{nil} -%endif - -# ---------------------------------------------------------------------------- -# Distribution support -# ---------------------------------------------------------------------------- -%if %{undefined distro_specific} -%define distro_specific 0 -%endif -%if %{distro_specific} - %if %(test -f /etc/enterprise-release && echo 1 || echo 0) - %define oelver %(rpm -qf --qf '%%{version}\\n' /etc/enterprise-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') - %if "%oelver" == "4" - %define distro_description Oracle Enterprise Linux 4 - %define distro_releasetag oel4 - %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %if "%oelver" == "5" - %define distro_description Oracle Enterprise Linux 5 - %define distro_releasetag oel5 - %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %{error:Oracle Enterprise Linux %{oelver} is unsupported} - %endif - %endif - %else - %if %(test -f /etc/oracle-release && echo 1 || echo 0) - %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') - %if "%elver" == "6" || "%elver" == "7" - %define distro_description Oracle Linux %elver - %define distro_releasetag el%elver - %define distro_buildreq gcc-c++ ncurses-devel perl time zlib-devel cmake libaio-devel numactl-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %{error:Oracle Linux %{elver} is unsupported} - %endif - %else - %if %(test -f /etc/redhat-release && echo 1 || echo 0) - %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') - %if "%rhelver" == "4" - %define distro_description Red Hat Enterprise Linux 4 - %define distro_releasetag rhel4 - %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %if "%rhelver" == "5" - %define distro_description Red Hat Enterprise Linux 5 - %define distro_releasetag rhel5 - %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %if "%rhelver" == "6" - %define distro_description Red Hat Enterprise Linux 6 - %define distro_releasetag rhel6 - %define distro_buildreq gcc-c++ ncurses-devel perl time zlib-devel cmake libaio-devel numactl-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools - %else - %{error:Red Hat Enterprise Linux %{rhelver} is unsupported} - %endif - %endif - %endif - %else - %if %(test -f /etc/SuSE-release && echo 1 || echo 0) - %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1) - %if "%susever" == "10" - %define distro_description SUSE Linux Enterprise Server 10 - %define distro_releasetag sles10 - %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client zlib-devel cmake libaio-devel - %define distro_requires aaa_base coreutils grep procps pwdutils - %else - %if "%susever" == "11" - %define distro_description SUSE Linux Enterprise Server 11 - %define distro_releasetag sles11 - %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils zlib-devel cmake libaio-devel libnuma-devel - %define distro_requires aaa_base coreutils grep procps pwdutils - %else - %{error:SuSE %{susever} is unsupported} - %endif - %endif - %else - %{error:Unsupported distribution} - %endif - %endif - %endif - %endif -%else - %define glibc_version %(/lib/libc.so.6 | grep stable | cut -d, -f1 | cut -c38-) - %define distro_description Generic Linux (glibc %{glibc_version}) - %define distro_releasetag linux_glibc%{glibc_version} - %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel - %define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd -%endif - -# Avoid debuginfo RPMs, leaves binaries unstripped -%define debug_package %{nil} - -# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted -# test for __debug_package -%define __strip /bin/true - -# ---------------------------------------------------------------------------- -# Support optional "tcmalloc" library (experimental) -# ---------------------------------------------------------------------------- -%if %{defined malloc_lib_target} -%define WITH_TCMALLOC 1 -%else -%define WITH_TCMALLOC 0 -%endif - -############################################################################## -# Configuration based upon above user input, not to be set directly -############################################################################## - -%if 0%{?commercial} -%define license_files_server %{src_dir}/LICENSE.mysql -%define license_type Commercial -%else -%define license_files_server %{src_dir}/COPYING %{src_dir}/README -%define license_type GPL -%endif - -############################################################################## -# Main spec file section -############################################################################## - -Name: MySQL%{product_suffix} -Summary: MySQL: a very fast and reliable SQL database server -Group: Applications/Databases -Version: 5.6.31 -Release: %{release}%{?distro_releasetag:.%{distro_releasetag}} -Distribution: %{distro_description} -License: Copyright (c) 2000, 2016, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field. -Source: http://www.mysql.com/Downloads/MySQL-5.6/%{src_dir}.tar.gz -URL: http://www.mysql.com/ -Packager: MySQL Release Engineering -Vendor: %{mysql_vendor} -BuildRequires: %{distro_buildreq} - -# Regression tests may take a long time, override the default to skip them -%{!?runselftest:%global runselftest 1} - -# Think about what you use here since the first step is to -# run a rm -rf -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -# From the manual -%description -The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, -and robust SQL (Structured Query Language) database server. MySQL Server -is intended for mission-critical, heavy-load production systems as well -as for embedding into mass-deployed software. MySQL is a trademark of -%{mysql_vendor} - -The MySQL software has Dual Licensing, which means you can use the MySQL -software free of charge under the GNU General Public License -(http://www.gnu.org/licenses/). You can also purchase commercial MySQL -licenses from %{mysql_vendor} if you do not wish to be bound by the terms of -the GPL. See the chapter "Licensing and Support" in the manual for -further info. - -The MySQL web site (http://www.mysql.com/) provides the latest -news and information about the MySQL software. Also please see the -documentation and the manual for more information. - -############################################################################## -# Sub package definition -############################################################################## - -%package -n MySQL-server%{product_suffix} -Summary: MySQL: a very fast and reliable SQL database server -Group: Applications/Databases -Requires: %{distro_requires} -%if 0%{?commercial} -Obsoletes: MySQL-server -%else -Obsoletes: MySQL-server-advanced -%endif -Obsoletes: mysql-server < %{version}-%{release} -Obsoletes: mysql-server-advanced -Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise -Obsoletes: MySQL-server-advanced-gpl MySQL-server-enterprise-gpl -Provides: mysql-server = %{version}-%{release} -Provides: mysql-server%{?_isa} = %{version}-%{release} - -%description -n MySQL-server%{product_suffix} -The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, -and robust SQL (Structured Query Language) database server. MySQL Server -is intended for mission-critical, heavy-load production systems as well -as for embedding into mass-deployed software. MySQL is a trademark of -%{mysql_vendor} - -The MySQL software has Dual Licensing, which means you can use the MySQL -software free of charge under the GNU General Public License -(http://www.gnu.org/licenses/). You can also purchase commercial MySQL -licenses from %{mysql_vendor} if you do not wish to be bound by the terms of -the GPL. See the chapter "Licensing and Support" in the manual for -further info. - -The MySQL web site (http://www.mysql.com/) provides the latest news and -information about the MySQL software. Also please see the documentation -and the manual for more information. - -This package includes the MySQL server binary as well as related utilities -to run and administer a MySQL server. - -If you want to access and work with the database, you have to install -package "MySQL-client%{product_suffix}" as well! - -# ---------------------------------------------------------------------------- -%package -n MySQL-client%{product_suffix} -Summary: MySQL - Client -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: MySQL-client -%else -Obsoletes: MySQL-client-advanced -%endif -Obsoletes: mysql < %{version}-%{release} -Obsoletes: mysql-advanced < %{version}-%{release} -Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise -Obsoletes: MySQL-client-advanced-gpl MySQL-client-enterprise-gpl -Provides: mysql = %{version}-%{release} -Provides: mysql%{?_isa} = %{version}-%{release} - -%description -n MySQL-client%{product_suffix} -This package contains the standard MySQL clients and administration tools. - -For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ - -# ---------------------------------------------------------------------------- -%package -n MySQL-test%{product_suffix} -Summary: MySQL - Test suite -Group: Applications/Databases -%if 0%{?commercial} -Requires: MySQL-client-advanced perl -Obsoletes: MySQL-test -%else -Requires: MySQL-client perl -Obsoletes: MySQL-test-advanced -%endif -Obsoletes: mysql-test < %{version}-%{release} -Obsoletes: mysql-test-advanced -Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise -Obsoletes: MySQL-test-advanced-gpl MySQL-test-enterprise-gpl -Provides: mysql-test = %{version}-%{release} -Provides: mysql-test%{?_isa} = %{version}-%{release} -AutoReqProv: no - -%description -n MySQL-test%{product_suffix} -This package contains the MySQL regression test suite. - -For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ - -# ---------------------------------------------------------------------------- -%package -n MySQL-devel%{product_suffix} -Summary: MySQL - Development header files and libraries -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: MySQL-devel -%else -Obsoletes: MySQL-devel-advanced -%endif -Obsoletes: mysql-devel < %{version}-%{release} -Obsoletes: mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced -Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise -Obsoletes: MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl -Provides: mysql-devel = %{version}-%{release} -Provides: mysql-devel%{?_isa} = %{version}-%{release} - -%description -n MySQL-devel%{product_suffix} -This package contains the development header files and libraries necessary -to develop MySQL client applications. - -For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ - -# ---------------------------------------------------------------------------- -%package -n MySQL-shared%{product_suffix} -Summary: MySQL - Shared libraries -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: MySQL-shared -%else -Obsoletes: MySQL-shared-advanced -%endif -Obsoletes: MySQL-shared-standard MySQL-shared-pro -Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl -Obsoletes: MySQL-shared-pro-gpl-cert -Obsoletes: MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise -Obsoletes: MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl - -%description -n MySQL-shared%{product_suffix} -This package contains the shared libraries (*.so*) which certain languages -and applications need to dynamically load and use MySQL. - -# ---------------------------------------------------------------------------- -%package -n MySQL-embedded%{product_suffix} -Summary: MySQL - Embedded library -Group: Applications/Databases -%if 0%{?commercial} -Requires: MySQL-devel-advanced -Obsoletes: MySQL-embedded -%else -Requires: MySQL-devel -Obsoletes: MySQL-embedded-advanced -%endif -Obsoletes: mysql-embedded < %{version}-%{release} -Obsoletes: mysql-embedded-advanced -Obsoletes: MySQL-embedded-pro -Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise -Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl -Provides: mysql-embedded = %{version}-%{release} -Provides: mysql-embedded%{?_isa} = %{version}-%{release} - -%description -n MySQL-embedded%{product_suffix} -This package contains the MySQL server as an embedded library. - -The embedded MySQL server library makes it possible to run a full-featured -MySQL server inside the client application. The main benefits are increased -speed and more simple management for embedded applications. - -The API is identical for the embedded MySQL version and the -client/server version. - -For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ - -############################################################################## -%prep -%setup -T -a 0 -c -n %{src_dir} -############################################################################## -%build - -# Fail quickly and obviously if user tries to build as root -%if %runselftest - if [ x"`id -u`" = x0 ]; then - echo "The MySQL regression tests may fail if run as root." - echo "If you really need to build the RPM as root, use" - echo "--define='runselftest 0' to skip the regression tests." - exit 1 - fi -%endif - -# Be strict about variables, bail at earliest opportunity, etc. -set -eu - -# Optional package files -touch optional-files-devel - -# -# Set environment in order of preference, MYSQL_BUILD_* first, then variable -# name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the -# default RPM build environment. -# - -# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break -# the compile in cmd-line-utils/libedit - needs investigation, but for now -# we simply unset it and use those specified directly in cmake. -%if "%{_arch}" == "ia64" -RPM_OPT_FLAGS= -%endif - -export PATH=${MYSQL_BUILD_PATH:-$PATH} -export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} -export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}} -export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}} -export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors}} -export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}} -export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}} -export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-} - -# By default, a build will include the bundeled "yaSSL" library for SSL. -# However, there may be a need to override. -# Protect against undefined variables if there is no override option. -%if %{undefined with_ssl} -%define ssl_option %{nil} -%else -%define ssl_option -DWITH_SSL=%{with_ssl} -%endif - -# Build debug mysqld and libmysqld.a -mkdir debug -( - cd debug - # Attempt to remove any optimisation flags from the debug build - CFLAGS=`echo " ${CFLAGS} " | \ - sed -e 's/ -O[0-9]* / /' \ - -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \ - -e 's/ -unroll2 / /' \ - -e 's/ -ip / /' \ - -e 's/^ //' \ - -e 's/ $//'` - CXXFLAGS=`echo " ${CXXFLAGS} " | \ - sed -e 's/ -O[0-9]* / /' \ - -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \ - -e 's/ -unroll2 / /' \ - -e 's/ -ip / /' \ - -e 's/^ //' \ - -e 's/ $//'` - # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before - # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM - ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ - -DCMAKE_BUILD_TYPE=Debug \ - -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ - -DFEATURE_SET="%{feature_set}" \ - %{ssl_option} \ - -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ - -DMYSQL_SERVER_SUFFIX="%{server_suffix}" - echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG - make ${MAKE_JFLAG} VERBOSE=1 -) -# Build full release -mkdir release -( - cd release - # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before - # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM - ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ - -DFEATURE_SET="%{feature_set}" \ - %{ssl_option} \ - -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ - -DMYSQL_SERVER_SUFFIX="%{server_suffix}" - echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG - make ${MAKE_JFLAG} VERBOSE=1 -) - -%if %runselftest - MTR_BUILD_THREAD=auto - export MTR_BUILD_THREAD - - (cd release && make test-bt-fast || true) -%endif - -############################################################################## -%install - -RBR=$RPM_BUILD_ROOT -MBD=$RPM_BUILD_DIR/%{src_dir} - -# Ensure that needed directories exists -install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} -install -d $RBR%{mysqldatadir}/mysql -install -d $RBR%{_datadir}/mysql-test -install -d $RBR%{_datadir}/mysql/SELinux/RHEL4 -install -d $RBR%{_includedir} -install -d $RBR%{_libdir} -install -d $RBR%{_mandir} -install -d $RBR%{_sbindir} - -mkdir -p $RBR%{_sysconfdir}/my.cnf.d - -# Install all binaries -( - cd $MBD/release - make DESTDIR=$RBR install -) - -# FIXME: at some point we should stop doing this and just install everything -# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming -# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax -mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/ - -# Install logrotate and autostart -install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql -install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql - -# Create a symlink "rcmysql", pointing to the init.script. SuSE users -# will appreciate that, as all services usually offer this. -ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql - -# Touch the place where the my.cnf config file might be located -# Just to make sure it's in the file list and marked as a config file -touch $RBR%{_sysconfdir}/my.cnf - -# Install SELinux files in datadir -install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \ - $RBR%{_datadir}/mysql/SELinux/RHEL4 - -%if %{WITH_TCMALLOC} -# Even though this is a shared library, put it under /usr/lib*/mysql, so it -# doesn't conflict with possible shared lib by the same name in /usr/lib*. See -# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used. -install -m 644 "%{malloc_lib_source}" \ - "$RBR%{_libdir}/mysql/%{malloc_lib_target}" -%endif - -# Remove man pages we explicitly do not want to package, avoids 'unpackaged -# files' warning. -# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* - -############################################################################## -# Post processing actions, i.e. when installed -############################################################################## - -%pre -n MySQL-server%{product_suffix} -# This is the code running at the beginning of a RPM upgrade action, -# before replacing the old files with the new ones. - -# ATTENTION: Parts of this are duplicated in the "triggerpostun" ! - -# There are users who deviate from the default file system layout. -# Check local settings to support them. -if [ -x %{_bindir}/my_print_defaults ] -then - mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` - PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'` -fi -if [ -z "$mysql_datadir" ] -then - mysql_datadir=%{mysqldatadir} -fi -if [ -z "$PID_FILE_PATT" ] -then - PID_FILE_PATT="$mysql_datadir/*.pid" -fi - -# Check if we can safely upgrade. An upgrade is only safe if it's from one -# of our RPMs in the same version family. - -# Handle both ways of spelling the capability. -installed=`rpm -q --whatprovides mysql-server 2> /dev/null` -if [ $? -ne 0 -o -z "$installed" ]; then - installed=`rpm -q --whatprovides MySQL-server 2> /dev/null` -fi -if [ $? -eq 0 -a -n "$installed" ]; then - installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names - vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` - version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` - myoldvendor='%{mysql_old_vendor}' - myvendor_2='%{mysql_vendor_2}' - myvendor='%{mysql_vendor}' - myversion='%{mysql_version}' - - old_family=`echo $version \ - | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'` - new_family=`echo $myversion \ - | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'` - - [ -z "$vendor" ] && vendor='' - [ -z "$old_family" ] && old_family="" - [ -z "$new_family" ] && new_family="" - - error_text= - if [ "$vendor" != "$myoldvendor" \ - -a "$vendor" != "$myvendor_2" \ - -a "$vendor" != "$myvendor" ]; then - error_text="$error_text -The current MySQL server package is provided by a different -vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor. -Some files may be installed to different locations, including log -files and the service startup script in %{_sysconfdir}/init.d/. -" - fi - - if [ "$old_family" != "$new_family" ]; then - error_text="$error_text -Upgrading directly from MySQL $old_family to MySQL $new_family may not -be safe in all cases. A manual dump and restore using mysqldump is -recommended. It is important to review the MySQL manual's Upgrading -section for version-specific incompatibilities. -" - fi - - if [ -n "$error_text" ]; then - cat <&2 - -****************************************************************** -A MySQL server package ($installed) is installed. -$error_text -A manual upgrade is required. - -- Ensure that you have a complete, working backup of your data and my.cnf - files -- Shut down the MySQL server cleanly -- Remove the existing MySQL packages. Usually this command will - list the packages you should remove: - rpm -qa | grep -i '^mysql-' - - You may choose to use 'rpm --nodeps -ev ' to remove - the package which contains the mysqlclient shared library. The - library will be reinstalled by the MySQL-shared-compat package. -- Install the new MySQL packages supplied by $myvendor -- Ensure that the MySQL server is started -- Run the 'mysql_upgrade' program - -This is a brief description of the upgrade process. Important details -can be found in the MySQL manual, in the Upgrading section. -****************************************************************** -HERE - exit 1 - fi -fi - -# We assume that if there is exactly one ".pid" file, -# it contains the valid PID of a running MySQL server. -NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l` -case $NR_PID_FILES in - 0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server - 1 ) SERVER_TO_START='true' ;; - * ) SERVER_TO_START='' # Situation not clear - SEVERAL_PID_FILES=true ;; -esac -# That logic may be debated: We might check whether it is non-empty, -# contains exactly one number (possibly a PID), and whether "ps" finds it. -# OTOH, if there is no such process, it means a crash without a cleanup - -# is that a reason not to start a new server after upgrade? - -STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER - -if [ -f "$STATUS_FILE" ]; then - echo "Some previous upgrade was not finished:" - ls -ld $STATUS_FILE - echo "Please check its status, then do" - echo " rm $STATUS_FILE" - echo "before repeating the MySQL upgrade." - exit 1 -elif [ -n "$SEVERAL_PID_FILES" ] ; then - echo "You have more than one PID file:" - ls -ld $PID_FILE_PATT - echo "Please check which one (if any) corresponds to a running server" - echo "and delete all others before repeating the MySQL upgrade." - exit 1 -fi - -NEW_VERSION=%{mysql_version}-%{release} - -# The "pre" section code is also run on a first installation, -# when there is no data directory yet. Protect against error messages. -# Check for the existence of subdirectory "mysql/", the database of system -# tables like "mysql.user". -if [ -d $mysql_datadir/mysql ] ; then - echo "MySQL RPM upgrade to version $NEW_VERSION" > $STATUS_FILE - echo "'pre' step running at `date`" >> $STATUS_FILE - echo >> $STATUS_FILE - fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l` - if [ $fcount -gt 0 ] ; then - echo "ERR file(s):" >> $STATUS_FILE - ls -ltr $mysql_datadir/*.err >> $STATUS_FILE - echo >> $STATUS_FILE - echo "Latest 'Version' line in latest file:" >> $STATUS_FILE - grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \ - tail -1 >> $STATUS_FILE - echo >> $STATUS_FILE - fi - - if [ -n "$SERVER_TO_START" ] ; then - # There is only one PID file, race possibility ignored - echo "PID file:" >> $STATUS_FILE - ls -l $PID_FILE_PATT >> $STATUS_FILE - cat $PID_FILE_PATT >> $STATUS_FILE - echo >> $STATUS_FILE - echo "Server process:" >> $STATUS_FILE - ps -fp `cat $PID_FILE_PATT` >> $STATUS_FILE - echo >> $STATUS_FILE - echo "SERVER_TO_START=$SERVER_TO_START" >> $STATUS_FILE - else - # Take a note we checked it ... - echo "PID file:" >> $STATUS_FILE - ls -l $PID_FILE_PATT >> $STATUS_FILE 2>&1 - fi -fi - -# Shut down a previously installed server first -# Note we *could* make that depend on $SERVER_TO_START, but we rather don't, -# so a "stop" is attempted even if there is no PID file. -# (Maybe the "stop" doesn't work then, but we might fix that in itself.) -if [ -x %{_sysconfdir}/init.d/mysql ] ; then - %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 - echo "Giving mysqld 5 seconds to exit nicely" - sleep 5 -fi - -%post -n MySQL-server%{product_suffix} -# This is the code running at the end of a RPM install or upgrade action, -# after the (new) files have been written. - -# ATTENTION: Parts of this are duplicated in the "triggerpostun" ! - -# There are users who deviate from the default file system layout. -# Check local settings to support them. -if [ -x %{_bindir}/my_print_defaults ] -then - mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` -fi -if [ -z "$mysql_datadir" ] -then - mysql_datadir=%{mysqldatadir} -fi - -NEW_VERSION=%{mysql_version}-%{release} -STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER - -# ---------------------------------------------------------------------- -# Create data directory if needed, check whether upgrade or install -# ---------------------------------------------------------------------- -if [ ! -d "$mysql_datadir" ] ; then mkdir -m 755 "$mysql_datadir" ; fi -if [ -f "$STATUS_FILE" ] ; then - SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` -else - SERVER_TO_START='' -fi -# echo "Analyzed: SERVER_TO_START=$SERVER_TO_START" -if [ ! -d $mysql_datadir/mysql ] ; then - mkdir $mysql_datadir/mysql $mysql_datadir/test - echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE -else - # If the directory exists, we may assume it is an upgrade. - echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE -fi - -# ---------------------------------------------------------------------- -# Make MySQL start/shutdown automatically when the machine does it. -# ---------------------------------------------------------------------- -# NOTE: This still needs to be debated. Should we check whether these links -# for the other run levels exist(ed) before the upgrade? -# use chkconfig on Enterprise Linux and newer SuSE releases -if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --add mysql -# use insserv for older SuSE Linux versions -elif [ -x /sbin/insserv ] ; then - /sbin/insserv %{_sysconfdir}/init.d/mysql -fi - -# ---------------------------------------------------------------------- -# Create a MySQL user and group. Do not report any problems if it already -# exists. -# ---------------------------------------------------------------------- -groupadd -r %{mysqld_group} 2> /dev/null || true -useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \ - -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true -# The user may already exist, make sure it has the proper group nevertheless -# (BUG#12823) -usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true - -# ---------------------------------------------------------------------- -# Change permissions so that the user that will run the MySQL daemon -# owns all database files. -# ---------------------------------------------------------------------- -chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir - -# ---------------------------------------------------------------------- -# Initiate databases if needed -# ---------------------------------------------------------------------- -if ! grep '^MySQL RPM upgrade' $STATUS_FILE >/dev/null 2>&1 ; then - # Fix bug#45415: no "mysql_install_db" on an upgrade - # Do this as a negative to err towards more "install" runs - # rather than to miss one. - %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user} --random-passwords - - # Attention: Now 'root' is the only database user, - # its password is a random value found in ~/.mysql_secret, - # and the "password expired" flag is set: - # Any client needs that password, and the first command - # executed must be a new "set password"! -fi - -# ---------------------------------------------------------------------- -# Upgrade databases if needed would go here - but it cannot be automated yet -# ---------------------------------------------------------------------- - -# ---------------------------------------------------------------------- -# Change permissions again to fix any new files. -# ---------------------------------------------------------------------- -chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir - -# ---------------------------------------------------------------------- -# Fix permissions for the permission database so that only the user -# can read them. -# ---------------------------------------------------------------------- -chmod -R og-rw $mysql_datadir/mysql - -# ---------------------------------------------------------------------- -# install SELinux files - but don't override existing ones -# ---------------------------------------------------------------------- -SETARGETDIR=/etc/selinux/targeted/src/policy -SEDOMPROG=$SETARGETDIR/domains/program -SECONPROG=$SETARGETDIR/file_contexts/program -if [ -f /etc/redhat-release ] \ - && (grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \ - || grep -q "CentOS release 4" /etc/redhat-release) ; then - echo - echo - echo 'Notes regarding SELinux on this platform:' - echo '=========================================' - echo - echo 'The default policy might cause server startup to fail because it is' - echo 'not allowed to access critical files. In this case, please update' - echo 'your installation.' - echo - echo 'The default policy might also cause inavailability of SSL related' - echo 'features because the server is not allowed to access /dev/random' - echo 'and /dev/urandom. If this is a problem, please do the following:' - echo - echo ' 1) install selinux-policy-targeted-sources from your OS vendor' - echo ' 2) add the following two lines to '$SEDOMPROG/mysqld.te':' - echo ' allow mysqld_t random_device_t:chr_file read;' - echo ' allow mysqld_t urandom_device_t:chr_file read;' - echo ' 3) cd to '$SETARGETDIR' and issue the following command:' - echo ' make load' - echo - echo -fi - -if [ -x sbin/restorecon ] ; then - sbin/restorecon -R var/lib/mysql -fi - -# Was the server running before the upgrade? If so, restart the new one. -if [ "$SERVER_TO_START" = "true" ] ; then - # Restart in the same way that mysqld will be started normally. - if [ -x %{_sysconfdir}/init.d/mysql ] ; then - %{_sysconfdir}/init.d/mysql start - echo "Giving mysqld 5 seconds to start" - sleep 5 - fi -fi - -# Collect an upgrade history ... -echo "Upgrade/install finished at `date`" >> $STATUS_FILE -echo >> $STATUS_FILE -echo "=====" >> $STATUS_FILE -STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY -cat $STATUS_FILE >> $STATUS_HISTORY -mv -f $STATUS_FILE ${STATUS_FILE}-LAST # for "triggerpostun" - - -#echo "Thank you for installing the MySQL Community Server! For Production -#systems, we recommend MySQL Enterprise, which contains enterprise-ready -#software, intelligent advisory services, and full production support with -#scheduled service packs and more. Visit www.mysql.com/enterprise for more -#information." - -%preun -n MySQL-server%{product_suffix} - -# Which '$1' does this refer to? Fedora docs have info: -# " ... a count of the number of versions of the package that are installed. -# Action Count -# Install the first time 1 -# Upgrade 2 or higher (depending on the number of versions installed) -# Remove last version of package 0 " -# -# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html - -if [ $1 = 0 ] ; then - # Stop MySQL before uninstalling it - if [ -x %{_sysconfdir}/init.d/mysql ] ; then - %{_sysconfdir}/init.d/mysql stop > /dev/null - # Remove autostart of MySQL - # use chkconfig on Enterprise Linux and newer SuSE releases - if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --del mysql - # For older SuSE Linux versions - elif [ -x /sbin/insserv ] ; then - /sbin/insserv -r %{_sysconfdir}/init.d/mysql - fi - fi -fi - -# We do not remove the mysql user since it may still own a lot of -# database files. - -%triggerpostun -n MySQL-server%{product_suffix} --MySQL-server-community - -# Setup: We renamed this package, so any existing "server-community" -# package will be removed when this "server" is installed. -# Problem: RPM will first run the "pre" and "post" sections of this script, -# and only then the "preun" of that old community server. -# But this "preun" includes stopping the server and uninstalling the service, -# "chkconfig --del mysql" which removes the symlinks to the start script. -# Solution: *After* the community server got removed, restart this server -# and re-install the service. -# -# For information about triggers in spec files, see the Fedora docs: -# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html -# For all details of this code, see the "pre" and "post" sections. - -# There are users who deviate from the default file system layout. -# Check local settings to support them. -if [ -x %{_bindir}/my_print_defaults ] -then - mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` -fi -if [ -z "$mysql_datadir" ] -then - mysql_datadir=%{mysqldatadir} -fi - -NEW_VERSION=%{mysql_version}-%{release} -STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference! -STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY - -if [ -f "$STATUS_FILE" ] ; then - SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` -else - # This should never happen, but let's be prepared - SERVER_TO_START='' -fi -echo "Analyzed: SERVER_TO_START=$SERVER_TO_START" - -if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --add mysql -# use insserv for older SuSE Linux versions -elif [ -x /sbin/insserv ] ; then - /sbin/insserv %{_sysconfdir}/init.d/mysql -fi - -# Was the server running before the upgrade? If so, restart the new one. -if [ "$SERVER_TO_START" = "true" ] ; then - # Restart in the same way that mysqld will be started normally. - if [ -x %{_sysconfdir}/init.d/mysql ] ; then - %{_sysconfdir}/init.d/mysql start - echo "Giving mysqld 5 seconds to start" - sleep 5 - fi -fi - -echo "Trigger 'postun --community' finished at `date`" >> $STATUS_HISTORY -echo >> $STATUS_HISTORY -echo "=====" >> $STATUS_HISTORY - - -# ---------------------------------------------------------------------- -# Clean up the BuildRoot after build is done -# ---------------------------------------------------------------------- -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ - && rm -rf $RPM_BUILD_ROOT; - -############################################################################## -# Files section -############################################################################## - -%files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files -%defattr(-,root,root,0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -%doc %{src_dir}/Docs/ChangeLog -%doc %{src_dir}/Docs/INFO_SRC* -%doc release/Docs/INFO_BIN* -%doc release/support-files/my-default.cnf - -%if 0%{?commercial} -%doc %attr(644, root, root) %{_infodir}/mysql.info* -%endif - -%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* -%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* -%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1* -%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* -%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* -%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1* -%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* -%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1* -%doc %attr(644, root, man) %{_mandir}/man1/perror.1* -%doc %attr(644, root, man) %{_mandir}/man1/replace.1* -%doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* -%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* - -%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf -%dir %{_sysconfdir}/my.cnf.d - -%attr(755, root, root) %{_bindir}/innochecksum -%attr(755, root, root) %{_bindir}/my_print_defaults -%attr(755, root, root) %{_bindir}/myisam_ftdump -%attr(755, root, root) %{_bindir}/myisamchk -%attr(755, root, root) %{_bindir}/myisamlog -%attr(755, root, root) %{_bindir}/myisampack -%attr(755, root, root) %{_bindir}/mysql_convert_table_format -%attr(755, root, root) %{_bindir}/mysql_fix_extensions -%attr(755, root, root) %{_bindir}/mysql_install_db -%attr(755, root, root) %{_bindir}/mysql_plugin -%attr(755, root, root) %{_bindir}/mysql_secure_installation -%attr(755, root, root) %{_bindir}/mysql_setpermission -%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql -%attr(755, root, root) %{_bindir}/mysql_upgrade -%attr(755, root, root) %{_bindir}/mysql_zap -%attr(755, root, root) %{_bindir}/mysqlbug -%attr(755, root, root) %{_bindir}/mysqld_multi -%attr(755, root, root) %{_bindir}/mysqld_safe -%attr(755, root, root) %{_bindir}/mysqldumpslow -%attr(755, root, root) %{_bindir}/mysqlhotcopy -%attr(755, root, root) %{_bindir}/mysqltest -%attr(755, root, root) %{_bindir}/perror -%attr(755, root, root) %{_bindir}/replace -%attr(755, root, root) %{_bindir}/resolve_stack_dump -%attr(755, root, root) %{_bindir}/resolveip - -%attr(755, root, root) %{_sbindir}/mysqld -%attr(755, root, root) %{_sbindir}/mysqld-debug -%attr(755, root, root) %{_sbindir}/rcmysql -%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini - -%if %{WITH_TCMALLOC} -%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} -%endif - -%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql -%attr(755, root, root) %{_sysconfdir}/init.d/mysql -%attr(755, root, root) %{_datadir}/mysql/ -%dir %attr(755, mysql, mysql) /var/lib/mysql - -# ---------------------------------------------------------------------------- -%files -n MySQL-client%{product_suffix} -%defattr(-, root, root, 0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -%attr(755, root, root) %{_bindir}/msql2mysql -%attr(755, root, root) %{_bindir}/mysql -%attr(755, root, root) %{_bindir}/mysql_find_rows -%attr(755, root, root) %{_bindir}/mysql_waitpid -%attr(755, root, root) %{_bindir}/mysqlaccess -# XXX: This should be moved to %{_sysconfdir} -%attr(644, root, root) %{_bindir}/mysqlaccess.conf -%attr(755, root, root) %{_bindir}/mysqladmin -%attr(755, root, root) %{_bindir}/mysqlbinlog -%attr(755, root, root) %{_bindir}/mysqlcheck -%attr(755, root, root) %{_bindir}/mysqldump -%attr(755, root, root) %{_bindir}/mysqlimport -%attr(755, root, root) %{_bindir}/mysqlshow -%attr(755, root, root) %{_bindir}/mysqlslap -%attr(755, root, root) %{_bindir}/mysql_config_editor - -%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_config_editor.1* - -# ---------------------------------------------------------------------------- -%files -n MySQL-devel%{product_suffix} -f optional-files-devel -%defattr(-, root, root, 0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* -%attr(755, root, root) %{_bindir}/mysql_config -%dir %attr(755, root, root) %{_includedir}/mysql -%dir %attr(755, root, root) %{_libdir}/mysql -%{_includedir}/mysql/* -%{_datadir}/aclocal/mysql.m4 -%{_libdir}/mysql/libmysqlclient.a -%{_libdir}/mysql/libmysqlclient_r.a -%{_libdir}/mysql/libmysqlservices.a - -# ---------------------------------------------------------------------------- -%files -n MySQL-shared%{product_suffix} -%defattr(-, root, root, 0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -# Shared libraries (omit for architectures that don't support them) -%{_libdir}/libmysql*.so* - -%post -n MySQL-shared%{product_suffix} -/sbin/ldconfig - -%postun -n MySQL-shared%{product_suffix} -/sbin/ldconfig - -# ---------------------------------------------------------------------------- -%files -n MySQL-test%{product_suffix} -%defattr(-, root, root, 0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -%attr(-, root, root) %{_datadir}/mysql-test -%attr(755, root, root) %{_bindir}/mysql_client_test -%attr(755, root, root) %{_bindir}/mysql_client_test_embedded -%attr(755, root, root) %{_bindir}/mysqltest_embedded -%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* - -# ---------------------------------------------------------------------------- -%files -n MySQL-embedded%{product_suffix} -%defattr(-, root, root, 0755) -%if %{defined license_files_server} -%doc %{license_files_server} -%endif -%attr(755, root, root) %{_bindir}/mysql_embedded -%attr(644, root, root) %{_libdir}/mysql/libmysqld.a -%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a - -############################################################################## -# The spec file changelog only includes changes made to the spec file -# itself - note that they must be ordered by date (important when -# merging BK trees) -############################################################################## -%changelog -* Mon Oct 06 2014 Balasubramanian Kandasamy -- Add license info in each subpackage - -* Wed May 28 2014 Balasubramanian Kandasamy -- Updated usergroup to mysql on datadir - -* Wed Oct 30 2013 Balasubramanian Kandasamy -- Removed non gpl file docs/mysql.info from community packages - -* Mon Sep 09 2013 Balasubramanian Kandasamy -- Updated logic to get the correct count of PID files - -* Fri Aug 16 2013 Balasubramanian Kandasamy -- Added provides lowercase mysql tags - -* Wed Jun 26 2013 Balasubramanian Kandasamy -- Cleaned up spec file to resolve rpm dependencies. - -* Mon Nov 05 2012 Joerg Bruehe - -- Allow to override the default to use the bundled yaSSL by an option like - --define="with_ssl /path/to/ssl" - -* Wed Oct 10 2012 Bjorn Munch - -- Replace old my-*.cnf config file examples with template my-default.cnf - -* Fri Oct 05 2012 Joerg Bruehe - -- Let the installation use the new option "--random-passwords" of "mysql_install_db". - (Bug# 12794345 Ensure root password) -- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence - of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff). - -* Tue Jul 24 2012 Joerg Bruehe - -- Add a macro "runselftest": - if set to 1 (default), the test suite will be run during the RPM build; - this can be oveeridden via the command line by adding - --define "runselftest 0" - Failures of the test suite will NOT make the RPM build fail! - -* Mon Jul 16 2012 Joerg Bruehe - -- Add the man page for the "mysql_config_editor". - -* Mon Jun 11 2012 Joerg Bruehe - -- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging. - -* Wed Feb 29 2012 Brajmohan Saxena - -- Removal all traces of the readline library from mysql (BUG 13738013) - -* Wed Sep 28 2011 Joerg Bruehe - -- Fix duplicate mentioning of "mysql_plugin" and its manual page, - it is better to keep alphabetic order in the files list (merging!). - -* Wed Sep 14 2011 Joerg Bruehe - -- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace - the RPMs of any configuration (of the current or the preceding release series) - by the new ones. This is done by not using the implicitly generated capabilities - (which include the configuration name) and relying on more generic ones which - just list the function ("server", "client", ...). - The implicit generation cannot be prevented, so all these capabilities must be - explicitly listed in "Obsoletes:" - -* Tue Sep 13 2011 Jonathan Perkin - -- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to - changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install) - this necessitated a move of the libmygcc.a installation to the install - phase, which is probably where it belonged in the first place. - -* Tue Sep 13 2011 Joerg Bruehe - -- "make_win_bin_dist" and its manual are dropped, cmake does it different. - -* Thu Sep 08 2011 Daniel Fischer - -- Add mysql_plugin man page. - -* Tue Aug 30 2011 Tor Didriksen - -- Set CXX=g++ by default to add a dependency on libgcc/libstdc++. - Also, remove the use of the -fno-exceptions and -fno-rtti flags. - TODO: update distro_buildreq/distro_requires - -* Tue Aug 30 2011 Joerg Bruehe - -- Add the manual page for "mysql_plugin" to the server package. - -* Fri Aug 19 2011 Joerg Bruehe - -- Null-upmerge the fix of bug#37165: This spec file is not affected. -- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}". - -* Fri Aug 12 2011 Daniel Fischer - -- Source plugin library files list from cmake-generated file. - -* Mon Jul 25 2011 Chuck Bell - -- Added the mysql_plugin client - enables or disables plugins. - -* Thu Jul 21 2011 Sunanda Menon - -- Fix bug#12561297: Added the MySQL embedded binary - -* Thu Jul 07 2011 Joerg Bruehe - -- Fix bug#45415: "rpm upgrade recreates test database" - Let the creation of the "test" database happen only during a new installation, - not in an RPM upgrade. - This affects both the "mkdir" and the call of "mysql_install_db". - -* Wed Feb 09 2011 Joerg Bruehe - -- Fix bug#56581: If an installation deviates from the default file locations - ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade) - should still work, and use these locations. - The problem was that the fix for bug#27072 did not check for local settings. - -* Mon Jan 31 2011 Joerg Bruehe - -- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN". - -* Tue Nov 23 2010 Jonathan Perkin - -- EXCEPTIONS-CLIENT has been deleted, remove it from here too -- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing - a '-j' argument to make. - -* Mon Nov 1 2010 Georgi Kodinov - -- Added test authentication (WL#1054) plugin binaries - -* Wed Oct 6 2010 Georgi Kodinov - -- Added example external authentication (WL#1054) plugin binaries - -* Wed Aug 11 2010 Joerg Bruehe - -- With a recent spec file cleanup, names have changed: A "-community" part was dropped. - Reflect that in the "Obsoletes" specifications. -- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM. -- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade". - -* Tue Jun 15 2010 Joerg Bruehe - -- Change the behaviour on installation and upgrade: - On installation, do not autostart the server. - *Iff* the server was stopped before the upgrade is started, this is taken as a - sign the administrator is handling that manually, and so the new server will - not be started automatically at the end of the upgrade. - The start/stop scripts will still be installed, so the server will be started - on the next machine boot. - This is the 5.5 version of fixing bug#27072 (RPM autostarting the server). - -* Tue Jun 1 2010 Jonathan Perkin - -- Implement SELinux checks from distribution-specific spec file. - -* Wed May 12 2010 Jonathan Perkin - -- Large number of changes to build using CMake -- Introduce distribution-specific RPMs -- Drop debuginfo, build all binaries with debug/symbols -- Remove __os_install_post, use native macro -- Remove _unpackaged_files_terminate_build, make it an error to have - unpackaged files -- Remove cluster RPMs - -* Wed Mar 24 2010 Joerg Bruehe - -- Add "--with-perfschema" to the configure options. - -* Mon Mar 22 2010 Joerg Bruehe - -- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64", - mask "rmdir" return code 1. -- Remove "ha_example.*" files from the list, they aren't built. - -* Wed Mar 17 2010 Joerg Bruehe - -- Fix a wrong path name in handling the debug plugins. - -* Wed Mar 10 2010 Joerg Bruehe - -- Take the result of the debug plugin build and put it into the optimized tree, - so that it becomes part of the final installation; - include the files in the packlist. Part of the fixes for bug#49022. - -* Mon Mar 01 2010 Joerg Bruehe - -- Set "Oracle and/or its affiliates" as the vendor and copyright owner, - accept upgrading from packages showing MySQL or Sun as vendor. - -* Fri Feb 12 2010 Joerg Bruehe - -- Formatting changes: - Have a consistent structure of separator lines and of indentation - (8 leading blanks => tab). -- Introduce the variable "src_dir". -- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence - over "CC" ("CXX"). -- Drop the old "with_static" argument analysis, this is not supported - in 5.1 since ages. -- Introduce variables to control the handlers individually, as well - as other options. -- Use the new "--with-plugin" notation for the table handlers. -- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql" - was done back in 2002 already. -- Make "--with-zlib-dir=bundled" the default, add an option to disable it. -- Add missing manual pages to the file list. -- Improve the runtime check for "libgcc.a", protect it against being tried - with the Intel compiler "icc". - -* Mon Jan 11 2010 Joerg Bruehe - -- Change RPM file naming: - - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc". - - Release counts from 1, not 0. - -* Wed Dec 23 2009 Joerg Bruehe - -- The "semisync" plugin file name has lost its introductory "lib", - adapt the file lists for the subpackages. - This is a part missing from the fix for bug#48351. -- Remove the "fix_privilege_tables" manual, it does not exist in 5.5 - (and likely, the whole script will go, too). - -* Mon Nov 16 2009 Joerg Bruehe - -- Fix some problems with the directives around "tcmalloc" (experimental), - remove erroneous traces of the InnoDB plugin (that is 5.1 only). - -* Tue Oct 06 2009 Magnus Blaudd - -- Removed mysql_fix_privilege_tables - -* Fri Oct 02 2009 Alexander Nozdrin - -- "mysqlmanager" got removed from version 5.4, all references deleted. - -* Fri Aug 28 2009 Joerg Bruehe - -- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin. - -* Thu Aug 27 2009 Joerg Bruehe - -- This version does not contain the "Instance manager", "mysqlmanager": - Remove it from the spec file so that packaging succeeds. - -* Mon Aug 24 2009 Jonathan Perkin - -- Add conditionals for bundled zlib and innodb plugin - -* Fri Aug 21 2009 Jonathan Perkin - -- Install plugin libraries in appropriate packages. -- Disable libdaemon_example and ftexample plugins. - -* Thu Aug 20 2009 Jonathan Perkin - -- Update variable used for mysql-test suite location to match source. - -* Fri Nov 07 2008 Joerg Bruehe - -- Correct yesterday's fix, so that it also works for the last flag, - and fix a wrong quoting: un-quoted quote marks must not be escaped. - -* Thu Nov 06 2008 Kent Boortz - -- Removed "mysql_upgrade_shell" -- Removed some copy/paste between debug and normal build - -* Thu Nov 06 2008 Joerg Bruehe - -- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. - This should cover both gcc and icc flags. Fixes bug#40546. - -* Fri Aug 29 2008 Kent Boortz - -- Removed the "Federated" storage engine option, and enabled in all - -* Tue Aug 26 2008 Joerg Bruehe - -- Get rid of the "warning: Installed (but unpackaged) file(s) found:" - Some generated files aren't needed in RPMs: - - the "sql-bench/" subdirectory - Some files were missing: - - /usr/share/aclocal/mysql.m4 ("devel" subpackage) - - Manual "mysqlbug" ("server" subpackage) - - Program "innochecksum" and its manual ("server" subpackage) - - Manual "mysql_find_rows" ("client" subpackage) - - Script "mysql_upgrade_shell" ("client" subpackage) - - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage) - - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage) - -* Mon Mar 31 2008 Kent Boortz - -- Made the "Federated" storage engine an option -- Made the "Cluster" storage engine and sub packages an option - -* Wed Mar 19 2008 Joerg Bruehe - -- Add the man pages for "ndbd" and "ndb_mgmd". - -* Mon Feb 18 2008 Timothy Smith - -- Require a manual upgrade if the alread-installed mysql-server is - from another vendor, or is of a different major version. - -* Wed May 02 2007 Joerg Bruehe - -- "ndb_size.tmpl" is not needed any more, - "man1/mysql_install_db.1" lacked the trailing '*'. - -* Sat Apr 07 2007 Kent Boortz - -- Removed man page for "mysql_create_system_tables" - -* Wed Mar 21 2007 Daniel Fischer - -- Add debug server. - -* Mon Mar 19 2007 Daniel Fischer - -- Remove Max RPMs; the server RPMs contain a mysqld compiled with all - features that previously only were built into Max. - -* Fri Mar 02 2007 Joerg Bruehe - -- Add several man pages for NDB which are now created. - -* Fri Jan 05 2007 Kent Boortz - -- Put back "libmygcc.a", found no real reason it was removed. - -- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the - correct "libgcc.a" path is returned for the 32/64 bit architecture. - -* Mon Dec 18 2006 Joerg Bruehe - -- Fix the move of "mysqlmanager" to section 8: Directory name was wrong. - -* Thu Dec 14 2006 Joerg Bruehe - -- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" - in the server RPM. -- The "mysqlmanager" man page got moved from section 1 to 8. - -* Thu Nov 30 2006 Joerg Bruehe - -- Call "make install" using "benchdir_root=%%{_datadir}", - because that is affecting the regression test suite as well. - -* Thu Nov 16 2006 Joerg Bruehe - -- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) - replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading - (bug#22081). - -* Mon Nov 13 2006 Joerg Bruehe - -- Add "--with-partition" to all server builds. - -- Use "--report-features" in one test run per server build. - -* Tue Aug 15 2006 Joerg Bruehe - -- The "max" server is removed from packages, effective from 5.1.12-beta. - Delete all steps to build, package, or install it. - -* Mon Jul 10 2006 Joerg Bruehe - -- Fix a typing error in the "make" target for the Perl script to run the tests. - -* Tue Jul 04 2006 Joerg Bruehe - -- Use the Perl script to run the tests, because it will automatically check - whether the server is configured with SSL. - -* Tue Jun 27 2006 Joerg Bruehe - -- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216) - -- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade, - there are some more aspects which need to be solved before this is possible. - For now, just ensure the binary "mysql_upgrade" is delivered and installed. - -* Thu Jun 22 2006 Joerg Bruehe - -- Close a gap of the previous version by explicitly using - a newly created temporary directory for the socket to be used - in the "mysql_upgrade" operation, overriding any local setting. - -* Tue Jun 20 2006 Joerg Bruehe - -- To run "mysql_upgrade", we need a running server; - start it in isolation and skip password checks. - -* Sat May 20 2006 Kent Boortz - -- Always compile for PIC, position independent code. - -* Wed May 10 2006 Kent Boortz - -- Use character set "all" when compiling with Cluster, to make Cluster - nodes independent on the character set directory, and the problem - that two RPM sub packages both wants to install this directory. - -* Mon May 01 2006 Kent Boortz - -- Use "./libtool --mode=execute" instead of searching for the - executable in current directory and ".libs". - -* Fri Apr 28 2006 Kent Boortz - -- Install and run "mysql_upgrade" - -* Wed Apr 12 2006 Jim Winstead - -- Remove sql-bench, and MySQL-bench RPM (will be built as an independent - project from the mysql-bench repository) - -* Tue Apr 11 2006 Jim Winstead - -- Remove old mysqltestmanager and related programs -* Sat Apr 01 2006 Kent Boortz - -- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS - -* Tue Mar 07 2006 Kent Boortz - -- Changed product name from "Community Edition" to "Community Server" - -* Mon Mar 06 2006 Kent Boortz - -- Fast mutexes is now disabled by default, but should be - used in Linux builds. - -* Mon Feb 20 2006 Kent Boortz - -- Reintroduced a max build -- Limited testing of 'debug' and 'max' servers -- Berkeley DB only in 'max' - -* Mon Feb 13 2006 Joerg Bruehe - -- Use "-i" on "make test-force"; - this is essential for later evaluation of this log file. - -* Thu Feb 09 2006 Kent Boortz - -- Pass '-static' to libtool, link static with our own libraries, dynamic - with system libraries. Link with the bundled zlib. - -* Wed Feb 08 2006 Kristian Nielsen - -- Modified RPM spec to match new 5.1 debug+max combined community packaging. - -* Sun Dec 18 2005 Kent Boortz - -- Added "client/mysqlslap" - -* Mon Dec 12 2005 Rodrigo Novo - -- Added zlib to the list of (static) libraries installed -- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) -- Compile MySQL with bundled zlib -- Fixed %%packager name to "MySQL Production Engineering Team" - -* Mon Dec 05 2005 Joerg Bruehe - -- Avoid using the "bundled" zlib on "shared" builds: - As it is not installed (on the build system), this gives dependency - problems with "libtool" causing the build to fail. - (Change was done on Nov 11, but left uncommented.) - -* Tue Nov 22 2005 Joerg Bruehe - -- Extend the file existence check for "init.d/mysql" on un-install - to also guard the call to "insserv"/"chkconfig". - -* Thu Oct 27 2005 Lenz Grimmer - -- added more man pages - -* Wed Oct 19 2005 Kent Boortz - -- Made yaSSL support an option (off by default) - -* Wed Oct 19 2005 Kent Boortz - -- Enabled yaSSL support - -* Sat Oct 15 2005 Kent Boortz - -- Give mode arguments the same way in all places -- Moved copy of mysqld.a to "standard" build, but - disabled it as we don't do embedded yet in 5.0 - -* Fri Oct 14 2005 Kent Boortz - -- For 5.x, always compile with --with-big-tables -- Copy the config.log file to location outside - the build tree - -* Fri Oct 14 2005 Kent Boortz - -- Removed unneeded/obsolete configure options -- Added archive engine to standard server -- Removed the embedded server from experimental server -- Changed suffix "-Max" => "-max" -- Changed comment string "Max" => "Experimental" - -* Thu Oct 13 2005 Lenz Grimmer - -- added a usermod call to assign a potential existing mysql user to the - correct user group (BUG#12823) -- Save the perror binary built during Max build so it supports the NDB - error codes (BUG#13740) -- added a separate macro "mysqld_group" to be able to define the - user group of the mysql user seperately, if desired. - -* Thu Sep 29 2005 Lenz Grimmer - -- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the - $RBR variable did not get expanded, thus leaving old build roots behind) - -* Thu Aug 04 2005 Lenz Grimmer - -- Fixed the creation of the mysql user group account in the postinstall - section (BUG 12348) -- Fixed enabling the Archive storage engine in the Max binary - -* Tue Aug 02 2005 Lenz Grimmer - -- Fixed the Requires: tag for the server RPM (BUG 12233) - -* Fri Jul 15 2005 Lenz Grimmer - -- create a "mysql" user group and assign the mysql user account to that group - in the server postinstall section. (BUG 10984) - -* Tue Jun 14 2005 Lenz Grimmer - -- Do not build statically on i386 by default, only when adding either "--with - static" or "--define '_with_static 1'" to the RPM build options. Static - linking really only makes sense when linking against the specially patched - glibc 2.2.5. - -* Mon Jun 06 2005 Lenz Grimmer - -- added mysql_client_test to the "bench" subpackage (BUG 10676) -- added the libndbclient static and shared libraries (BUG 10676) - -* Wed Jun 01 2005 Lenz Grimmer - -- use "mysqldatadir" variable instead of hard-coding the path multiple times -- use the "mysqld_user" variable on all occasions a user name is referenced -- removed (incomplete) Brazilian translations -- removed redundant release tags from the subpackage descriptions - -* Wed May 25 2005 Joerg Bruehe - -- Added a "make clean" between separate calls to "BuildMySQL". - -* Thu May 12 2005 Guilhem Bichot - -- Removed the mysql_tableinfo script made obsolete by the information schema - -* Wed Apr 20 2005 Lenz Grimmer - -- Enabled the "blackhole" storage engine for the Max RPM - -* Wed Apr 13 2005 Lenz Grimmer - -- removed the MySQL manual files (html/ps/texi) - they have been removed - from the MySQL sources and are now available seperately. - -* Mon Apr 4 2005 Petr Chardin - -- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into - mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively - -* Fri Mar 18 2005 Lenz Grimmer - -- Disabled RAID in the Max binaries once and for all (it has finally been - removed from the source tree) - -* Sun Feb 20 2005 Petr Chardin - -- Install MySQL Instance Manager together with mysqld, touch mysqlmanager - password file - -* Mon Feb 14 2005 Lenz Grimmer - -- Fixed the compilation comments and moved them into the separate build sections - for Max and Standard - -* Mon Feb 7 2005 Tomas Ulin - -- enabled the "Ndbcluster" storage engine for the max binary -- added extra make install in ndb subdir after Max build to get ndb binaries -- added packages for ndbcluster storage engine - -* Fri Jan 14 2005 Lenz Grimmer - -- replaced obsoleted "BuildPrereq" with "BuildRequires" instead - -* Thu Jan 13 2005 Lenz Grimmer - -- enabled the "Federated" storage engine for the max binary - -* Tue Jan 04 2005 Petr Chardin - -- ISAM and merge storage engines were purged. As well as appropriate - tools and manpages (isamchk and isamlog) - -* Fri Dec 31 2004 Lenz Grimmer - -- enabled the "Archive" storage engine for the max binary -- enabled the "CSV" storage engine for the max binary -- enabled the "Example" storage engine for the max binary - -* Thu Aug 26 2004 Lenz Grimmer - -- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860) - -* Fri Aug 20 2004 Lenz Grimmer - -- do not link statically on IA64/AMD64 as these systems do not have - a patched glibc installed - -* Tue Aug 10 2004 Lenz Grimmer - -- Added libmygcc.a to the devel subpackage (required to link applications - against the the embedded server libmysqld.a) (BUG 4921) - -* Mon Aug 09 2004 Lenz Grimmer - -- Added EXCEPTIONS-CLIENT to the "devel" package - -* Thu Jul 29 2004 Lenz Grimmer - -- disabled OpenSSL in the Max binaries again (the RPM packages were the - only exception to this anyway) (BUG 1043) - -* Wed Jun 30 2004 Lenz Grimmer - -- fixed server postinstall (mysql_install_db was called with the wrong - parameter) - -* Thu Jun 24 2004 Lenz Grimmer - -- added mysql_tzinfo_to_sql to the server subpackage -- run "make clean" instead of "make distclean" - -* Mon Apr 05 2004 Lenz Grimmer - -- added ncurses-devel to the build prerequisites (BUG 3377) - -* Thu Feb 12 2004 Lenz Grimmer - -- when using gcc, _always_ use CXX=gcc -- replaced Copyright with License field (Copyright is obsolete) - -* Tue Feb 03 2004 Lenz Grimmer - -- added myisam_ftdump to the Server package - -* Tue Jan 13 2004 Lenz Grimmer - -- link the mysql client against libreadline instead of libedit (BUG 2289) - -* Mon Dec 22 2003 Lenz Grimmer - -- marked /etc/logrotate.d/mysql as a config file (BUG 2156) - -* Sat Dec 13 2003 Lenz Grimmer - -- fixed file permissions (BUG 1672) - -* Thu Dec 11 2003 Lenz Grimmer - -- made testing for gcc3 a bit more robust - -* Fri Dec 05 2003 Lenz Grimmer - -- added missing file mysql_create_system_tables to the server subpackage - -* Fri Nov 21 2003 Lenz Grimmer - -- removed dependency on MySQL-client from the MySQL-devel subpackage - as it is not really required. (BUG 1610) - -* Fri Aug 29 2003 Lenz Grimmer - -- Fixed BUG 1162 (removed macro names from the changelog) -- Really fixed BUG 998 (disable the checking for installed but - unpackaged files) - -* Tue Aug 05 2003 Lenz Grimmer - -- Fixed BUG 959 (libmysqld not being compiled properly) -- Fixed BUG 998 (RPM build errors): added missing files to the - distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow, - mysql_fix_privilege_tables.1), removed "-n" from install section. - -* Wed Jul 09 2003 Lenz Grimmer - -- removed the GIF Icon (file was not included in the sources anyway) -- removed unused variable shared_lib_version -- do not run automake before building the standard binary - (should not be necessary) -- add server suffix '-standard' to standard binary (to be in line - with the binary tarball distributions) -- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir, - _datadir, _includedir) throughout the spec file. -- allow overriding CC and CXX (required when building with other compilers) - -* Fri May 16 2003 Lenz Grimmer - -- re-enabled RAID again - -* Wed Apr 30 2003 Lenz Grimmer - -- disabled MyISAM RAID (--with-raid) - it throws an assertion which - needs to be investigated first. - -* Mon Mar 10 2003 Lenz Grimmer - -- added missing file mysql_secure_installation to server subpackage - (BUG 141) - -* Tue Feb 11 2003 Lenz Grimmer - -- re-added missing pre- and post(un)install scripts to server subpackage -- added config file /etc/my.cnf to the file list (just for completeness) -- make sure to create the datadir with 755 permissions - -* Mon Jan 27 2003 Lenz Grimmer - -- removed unused CC and CXX variables -- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS - -* Fri Jan 24 2003 Lenz Grimmer - -- renamed package "MySQL" to "MySQL-server" -- fixed Copyright tag -- added mysql_waitpid to client subpackage (required for mysql-test-run) - -* Wed Nov 27 2002 Lenz Grimmer - -- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of - Linux distributions now support this scheme as proposed by the LSB either - directly or via a compatibility symlink) -- Use new "restart" init script action instead of starting and stopping - separately -- Be more flexible in activating the automatic bootup - use insserv (on - older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and - others) to create the respective symlinks - -* Wed Sep 25 2002 Lenz Grimmer - -- MySQL-Max now requires MySQL >= 4.0 to avoid version mismatches - (mixing 3.23 and 4.0 packages) - -* Fri Aug 09 2002 Lenz Grimmer - -- Turn off OpenSSL in MySQL-Max for now until it works properly again -- enable RAID for the Max binary instead -- added compatibility link: safe_mysqld -> mysqld_safe to ease the - transition from 3.23 - -* Thu Jul 18 2002 Lenz Grimmer - -- Reworked the build steps a little bit: the Max binary is supposed - to include OpenSSL, which cannot be linked statically, thus trying - to statically link against a special glibc is futile anyway -- because of this, it is not required to make yet another build run - just to compile the shared libs (saves a lot of time) -- updated package description of the Max subpackage -- clean up the BuildRoot directory afterwards - -* Mon Jul 15 2002 Lenz Grimmer - -- Updated Packager information -- Fixed the build options: the regular package is supposed to - include InnoDB and linked statically, while the Max package - should include BDB and SSL support - -* Fri May 03 2002 Lenz Grimmer - -- Use more RPM macros (e.g. infodir, mandir) to make the spec - file more portable -- reorganized the installation of documentation files: let RPM - take care of this -- reorganized the file list: actually install man pages along - with the binaries of the respective subpackage -- do not include libmysqld.a in the devel subpackage as well, if we - have a special "embedded" subpackage -- reworked the package descriptions - -* Mon Oct 8 2001 Monty - -- Added embedded server as a separate RPM - -* Fri Apr 13 2001 Monty - -- Added mysqld-max to the distribution - -* Tue Jan 2 2001 Monty - -- Added mysql-test to the bench package - -* Fri Aug 18 2000 Tim Smith - -- Added separate libmysql_r directory; now both a threaded - and non-threaded library is shipped. - -* Tue Sep 28 1999 David Axmark - -- Added the support-files/my-example.cnf to the docs directory. - -- Removed devel dependency on base since it is about client - development. - -* Wed Sep 8 1999 David Axmark - -- Cleaned up some for 3.23. - -* Thu Jul 1 1999 David Axmark - -- Added support for shared libraries in a separate sub - package. Original fix by David Fox (dsfox@cogsci.ucsd.edu) - -- The --enable-assembler switch is now automatically disables on - platforms there assembler code is unavailable. This should allow - building this RPM on non i386 systems. - -* Mon Feb 22 1999 David Axmark - -- Removed unportable cc switches from the spec file. The defaults can - now be overridden with environment variables. This feature is used - to compile the official RPM with optimal (but compiler version - specific) switches. - -- Removed the repetitive description parts for the sub rpms. Maybe add - again if RPM gets a multiline macro capability. - -- Added support for a pt_BR translation. Translation contributed by - Jorge Godoy . - -* Wed Nov 4 1998 David Axmark - -- A lot of changes in all the rpm and install scripts. This may even - be a working RPM :-) - -* Sun Aug 16 1998 David Axmark - -- A developers changelog for MySQL is available in the source RPM. And - there is a history of major user visible changed in the Reference - Manual. Only RPM specific changes will be documented here. diff -Nru mysql-5.6-5.6.31/support-files/mysql.5.6.33.spec mysql-5.6-5.6.33/support-files/mysql.5.6.33.spec --- mysql-5.6-5.6.31/support-files/mysql.5.6.33.spec 1970-01-01 00:00:00.000000000 +0000 +++ mysql-5.6-5.6.33/support-files/mysql.5.6.33.spec 2016-08-26 11:32:53.000000000 +0000 @@ -0,0 +1,2103 @@ +# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston +# MA 02110-1301 USA. + +############################################################################## +# Some common macro definitions +############################################################################## + +# NOTE: "vendor" is used in upgrade/downgrade check, so you can't +# change these, has to be exactly as is. +%global mysql_old_vendor MySQL AB +%global mysql_vendor_2 Sun Microsystems, Inc. +%global mysql_vendor Oracle and/or its affiliates + +%global mysql_version 5.6.33 + +%global mysqld_user mysql +%global mysqld_group mysql +%global mysqldatadir /var/lib/mysql + +%global release 1 + + +# +# Macros we use which are not available in all supported versions of RPM +# +# - defined/undefined are missing on RHEL4 +# +%if %{expand:%{?defined:0}%{!?defined:1}} +%define defined() %{expand:%%{?%{1}:1}%%{!?%{1}:0}} +%endif +%if %{expand:%{?undefined:0}%{!?undefined:1}} +%define undefined() %{expand:%%{?%{1}:0}%%{!?%{1}:1}} +%endif + +# ---------------------------------------------------------------------------- +# RPM build tools now automatically detect Perl module dependencies. This +# detection causes problems as it is broken in some versions, and it also +# provides unwanted dependencies from mandatory scripts in our package. +# It might not be possible to disable this in all versions of RPM, but here we +# try anyway. We keep the "AutoReqProv: no" for the "test" sub package, as +# disabling here might fail, and that package has the most problems. +# See: +# http://fedoraproject.org/wiki/Packaging/Perl#Filtering_Requires:_and_Provides +# http://www.wideopen.com/archives/rpm-list/2002-October/msg00343.html +# ---------------------------------------------------------------------------- +%undefine __perl_provides +%undefine __perl_requires + +############################################################################## +# Command line handling +############################################################################## +# +# To set options: +# +# $ rpmbuild --define="option " ... +# + +# ---------------------------------------------------------------------------- +# Commercial builds +# ---------------------------------------------------------------------------- +%if %{undefined commercial} +%define commercial 0 +%endif + +# ---------------------------------------------------------------------------- +# Source name +# ---------------------------------------------------------------------------- +%if %{undefined src_base} +%define src_base mysql +%endif +%define src_dir %{src_base}-%{mysql_version} + +# ---------------------------------------------------------------------------- +# Feature set (storage engines, options). Default to community (everything) +# ---------------------------------------------------------------------------- +%if %{undefined feature_set} +%define feature_set community +%endif + +# ---------------------------------------------------------------------------- +# Server comment strings +# ---------------------------------------------------------------------------- +%if %{undefined compilation_comment_debug} +%define compilation_comment_debug MySQL Community Server - Debug (GPL) +%endif +%if %{undefined compilation_comment_release} +%define compilation_comment_release MySQL Community Server (GPL) +%endif + +# ---------------------------------------------------------------------------- +# Product and server suffixes +# ---------------------------------------------------------------------------- +%if %{undefined product_suffix} + %if %{defined short_product_tag} + %define product_suffix -%{short_product_tag} + %else + %define product_suffix %{nil} + %endif +%endif + +%if %{undefined server_suffix} +%define server_suffix %{nil} +%endif + +# ---------------------------------------------------------------------------- +# Distribution support +# ---------------------------------------------------------------------------- +%if %{undefined distro_specific} +%define distro_specific 0 +%endif +%if %{distro_specific} + %if %(test -f /etc/enterprise-release && echo 1 || echo 0) + %define oelver %(rpm -qf --qf '%%{version}\\n' /etc/enterprise-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') + %if "%oelver" == "4" + %define distro_description Oracle Enterprise Linux 4 + %define distro_releasetag oel4 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %if "%oelver" == "5" + %define distro_description Oracle Enterprise Linux 5 + %define distro_releasetag oel5 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %{error:Oracle Enterprise Linux %{oelver} is unsupported} + %endif + %endif + %else + %if %(test -f /etc/oracle-release && echo 1 || echo 0) + %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') + %if "%elver" == "6" || "%elver" == "7" + %define distro_description Oracle Linux %elver + %define distro_releasetag el%elver + %define distro_buildreq gcc-c++ ncurses-devel perl time zlib-devel cmake libaio-devel numactl-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %{error:Oracle Linux %{elver} is unsupported} + %endif + %else + %if %(test -f /etc/redhat-release && echo 1 || echo 0) + %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g') + %if "%rhelver" == "4" + %define distro_description Red Hat Enterprise Linux 4 + %define distro_releasetag rhel4 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %if "%rhelver" == "5" + %define distro_description Red Hat Enterprise Linux 5 + %define distro_releasetag rhel5 + %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel cmake libaio-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %if "%rhelver" == "6" + %define distro_description Red Hat Enterprise Linux 6 + %define distro_releasetag rhel6 + %define distro_buildreq gcc-c++ ncurses-devel perl time zlib-devel cmake libaio-devel numactl-devel + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools + %else + %{error:Red Hat Enterprise Linux %{rhelver} is unsupported} + %endif + %endif + %endif + %else + %if %(test -f /etc/SuSE-release && echo 1 || echo 0) + %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1) + %if "%susever" == "10" + %define distro_description SUSE Linux Enterprise Server 10 + %define distro_releasetag sles10 + %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client zlib-devel cmake libaio-devel + %define distro_requires aaa_base coreutils grep procps pwdutils + %else + %if "%susever" == "11" + %define distro_description SUSE Linux Enterprise Server 11 + %define distro_releasetag sles11 + %define distro_buildreq gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils zlib-devel cmake libaio-devel libnuma-devel + %define distro_requires aaa_base coreutils grep procps pwdutils + %else + %{error:SuSE %{susever} is unsupported} + %endif + %endif + %else + %{error:Unsupported distribution} + %endif + %endif + %endif + %endif +%else + %define glibc_version %(/lib/libc.so.6 | grep stable | cut -d, -f1 | cut -c38-) + %define distro_description Generic Linux (glibc %{glibc_version}) + %define distro_releasetag linux_glibc%{glibc_version} + %define distro_buildreq gcc-c++ gperf ncurses-devel perl time zlib-devel + %define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd +%endif + +# Avoid debuginfo RPMs, leaves binaries unstripped +%define debug_package %{nil} + +# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted +# test for __debug_package +%define __strip /bin/true + +# ---------------------------------------------------------------------------- +# Support optional "tcmalloc" library (experimental) +# ---------------------------------------------------------------------------- +%if %{defined malloc_lib_target} +%define WITH_TCMALLOC 1 +%else +%define WITH_TCMALLOC 0 +%endif + +############################################################################## +# Configuration based upon above user input, not to be set directly +############################################################################## + +%if 0%{?commercial} +%define license_files_server %{src_dir}/LICENSE.mysql +%define license_type Commercial +%else +%define license_files_server %{src_dir}/COPYING %{src_dir}/README +%define license_type GPL +%endif + +############################################################################## +# Main spec file section +############################################################################## + +Name: MySQL%{product_suffix} +Summary: MySQL: a very fast and reliable SQL database server +Group: Applications/Databases +Version: 5.6.33 +Release: %{release}%{?distro_releasetag:.%{distro_releasetag}} +Distribution: %{distro_description} +License: Copyright (c) 2000, 2016, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field. +Source: http://www.mysql.com/Downloads/MySQL-5.6/%{src_dir}.tar.gz +URL: http://www.mysql.com/ +Packager: MySQL Release Engineering +Vendor: %{mysql_vendor} +BuildRequires: %{distro_buildreq} + +# Regression tests may take a long time, override the default to skip them +%{!?runselftest:%global runselftest 1} + +# Think about what you use here since the first step is to +# run a rm -rf +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# From the manual +%description +The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, +and robust SQL (Structured Query Language) database server. MySQL Server +is intended for mission-critical, heavy-load production systems as well +as for embedding into mass-deployed software. MySQL is a trademark of +%{mysql_vendor} + +The MySQL software has Dual Licensing, which means you can use the MySQL +software free of charge under the GNU General Public License +(http://www.gnu.org/licenses/). You can also purchase commercial MySQL +licenses from %{mysql_vendor} if you do not wish to be bound by the terms of +the GPL. See the chapter "Licensing and Support" in the manual for +further info. + +The MySQL web site (http://www.mysql.com/) provides the latest +news and information about the MySQL software. Also please see the +documentation and the manual for more information. + +############################################################################## +# Sub package definition +############################################################################## + +%package -n MySQL-server%{product_suffix} +Summary: MySQL: a very fast and reliable SQL database server +Group: Applications/Databases +Requires: %{distro_requires} +%if 0%{?commercial} +Obsoletes: MySQL-server +%else +Obsoletes: MySQL-server-advanced +%endif +Obsoletes: mysql-server < %{version}-%{release} +Obsoletes: mysql-server-advanced +Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise +Obsoletes: MySQL-server-advanced-gpl MySQL-server-enterprise-gpl +Provides: mysql-server = %{version}-%{release} +Provides: mysql-server%{?_isa} = %{version}-%{release} + +%description -n MySQL-server%{product_suffix} +The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, +and robust SQL (Structured Query Language) database server. MySQL Server +is intended for mission-critical, heavy-load production systems as well +as for embedding into mass-deployed software. MySQL is a trademark of +%{mysql_vendor} + +The MySQL software has Dual Licensing, which means you can use the MySQL +software free of charge under the GNU General Public License +(http://www.gnu.org/licenses/). You can also purchase commercial MySQL +licenses from %{mysql_vendor} if you do not wish to be bound by the terms of +the GPL. See the chapter "Licensing and Support" in the manual for +further info. + +The MySQL web site (http://www.mysql.com/) provides the latest news and +information about the MySQL software. Also please see the documentation +and the manual for more information. + +This package includes the MySQL server binary as well as related utilities +to run and administer a MySQL server. + +If you want to access and work with the database, you have to install +package "MySQL-client%{product_suffix}" as well! + +# ---------------------------------------------------------------------------- +%package -n MySQL-client%{product_suffix} +Summary: MySQL - Client +Group: Applications/Databases +%if 0%{?commercial} +Obsoletes: MySQL-client +%else +Obsoletes: MySQL-client-advanced +%endif +Obsoletes: mysql < %{version}-%{release} +Obsoletes: mysql-advanced < %{version}-%{release} +Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise +Obsoletes: MySQL-client-advanced-gpl MySQL-client-enterprise-gpl +Provides: mysql = %{version}-%{release} +Provides: mysql%{?_isa} = %{version}-%{release} + +%description -n MySQL-client%{product_suffix} +This package contains the standard MySQL clients and administration tools. + +For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ + +# ---------------------------------------------------------------------------- +%package -n MySQL-test%{product_suffix} +Summary: MySQL - Test suite +Group: Applications/Databases +%if 0%{?commercial} +Requires: MySQL-client-advanced perl +Obsoletes: MySQL-test +%else +Requires: MySQL-client perl +Obsoletes: MySQL-test-advanced +%endif +Obsoletes: mysql-test < %{version}-%{release} +Obsoletes: mysql-test-advanced +Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise +Obsoletes: MySQL-test-advanced-gpl MySQL-test-enterprise-gpl +Provides: mysql-test = %{version}-%{release} +Provides: mysql-test%{?_isa} = %{version}-%{release} +AutoReqProv: no + +%description -n MySQL-test%{product_suffix} +This package contains the MySQL regression test suite. + +For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ + +# ---------------------------------------------------------------------------- +%package -n MySQL-devel%{product_suffix} +Summary: MySQL - Development header files and libraries +Group: Applications/Databases +%if 0%{?commercial} +Obsoletes: MySQL-devel +%else +Obsoletes: MySQL-devel-advanced +%endif +Obsoletes: mysql-devel < %{version}-%{release} +Obsoletes: mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced +Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise +Obsoletes: MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl +Provides: mysql-devel = %{version}-%{release} +Provides: mysql-devel%{?_isa} = %{version}-%{release} + +%description -n MySQL-devel%{product_suffix} +This package contains the development header files and libraries necessary +to develop MySQL client applications. + +For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ + +# ---------------------------------------------------------------------------- +%package -n MySQL-shared%{product_suffix} +Summary: MySQL - Shared libraries +Group: Applications/Databases +%if 0%{?commercial} +Obsoletes: MySQL-shared +%else +Obsoletes: MySQL-shared-advanced +%endif +Obsoletes: MySQL-shared-standard MySQL-shared-pro +Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl +Obsoletes: MySQL-shared-pro-gpl-cert +Obsoletes: MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise +Obsoletes: MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl + +%description -n MySQL-shared%{product_suffix} +This package contains the shared libraries (*.so*) which certain languages +and applications need to dynamically load and use MySQL. + +# ---------------------------------------------------------------------------- +%package -n MySQL-embedded%{product_suffix} +Summary: MySQL - Embedded library +Group: Applications/Databases +%if 0%{?commercial} +Requires: MySQL-devel-advanced +Obsoletes: MySQL-embedded +%else +Requires: MySQL-devel +Obsoletes: MySQL-embedded-advanced +%endif +Obsoletes: mysql-embedded < %{version}-%{release} +Obsoletes: mysql-embedded-advanced +Obsoletes: MySQL-embedded-pro +Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise +Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl +Provides: mysql-embedded = %{version}-%{release} +Provides: mysql-embedded%{?_isa} = %{version}-%{release} + +%description -n MySQL-embedded%{product_suffix} +This package contains the MySQL server as an embedded library. + +The embedded MySQL server library makes it possible to run a full-featured +MySQL server inside the client application. The main benefits are increased +speed and more simple management for embedded applications. + +The API is identical for the embedded MySQL version and the +client/server version. + +For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ + +############################################################################## +%prep +%setup -T -a 0 -c -n %{src_dir} +############################################################################## +%build + +# Fail quickly and obviously if user tries to build as root +%if %runselftest + if [ x"`id -u`" = x0 ]; then + echo "The MySQL regression tests may fail if run as root." + echo "If you really need to build the RPM as root, use" + echo "--define='runselftest 0' to skip the regression tests." + exit 1 + fi +%endif + +# Be strict about variables, bail at earliest opportunity, etc. +set -eu + +# Optional package files +touch optional-files-devel + +# +# Set environment in order of preference, MYSQL_BUILD_* first, then variable +# name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the +# default RPM build environment. +# + +# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break +# the compile in cmd-line-utils/libedit - needs investigation, but for now +# we simply unset it and use those specified directly in cmake. +%if "%{_arch}" == "ia64" +RPM_OPT_FLAGS= +%endif + +export PATH=${MYSQL_BUILD_PATH:-$PATH} +export CC=${MYSQL_BUILD_CC:-${CC:-gcc}} +export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}} +export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}} +export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors}} +export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}} +export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}} +export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-} + +# By default, a build will include the bundeled "yaSSL" library for SSL. +# However, there may be a need to override. +# Protect against undefined variables if there is no override option. +%if %{undefined with_ssl} +%define ssl_option %{nil} +%else +%define ssl_option -DWITH_SSL=%{with_ssl} +%endif + +# Build debug mysqld and libmysqld.a +mkdir debug +( + cd debug + # Attempt to remove any optimisation flags from the debug build + CFLAGS=`echo " ${CFLAGS} " | \ + sed -e 's/ -O[0-9]* / /' \ + -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \ + -e 's/ -unroll2 / /' \ + -e 's/ -ip / /' \ + -e 's/^ //' \ + -e 's/ $//'` + CXXFLAGS=`echo " ${CXXFLAGS} " | \ + sed -e 's/ -O[0-9]* / /' \ + -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \ + -e 's/ -unroll2 / /' \ + -e 's/ -ip / /' \ + -e 's/^ //' \ + -e 's/ $//'` + # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before + # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM + ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ + -DCMAKE_BUILD_TYPE=Debug \ + -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ + -DFEATURE_SET="%{feature_set}" \ + %{ssl_option} \ + -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ + -DMYSQL_SERVER_SUFFIX="%{server_suffix}" + echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG + make ${MAKE_JFLAG} VERBOSE=1 +) +# Build full release +mkdir release +( + cd release + # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before + # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM + ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ + -DFEATURE_SET="%{feature_set}" \ + %{ssl_option} \ + -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ + -DMYSQL_SERVER_SUFFIX="%{server_suffix}" + echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG + make ${MAKE_JFLAG} VERBOSE=1 +) + +%if %runselftest + MTR_BUILD_THREAD=auto + export MTR_BUILD_THREAD + + (cd release && make test-bt-fast || true) +%endif + +############################################################################## +%install + +RBR=$RPM_BUILD_ROOT +MBD=$RPM_BUILD_DIR/%{src_dir} + +# Ensure that needed directories exists +install -d $RBR%{_sysconfdir}/{logrotate.d,init.d} +install -d $RBR%{mysqldatadir}/mysql +install -d $RBR%{_datadir}/mysql-test +install -d $RBR%{_datadir}/mysql/SELinux/RHEL4 +install -d $RBR%{_includedir} +install -d $RBR%{_libdir} +install -d $RBR%{_mandir} +install -d $RBR%{_sbindir} + +mkdir -p $RBR%{_sysconfdir}/my.cnf.d + +# Install all binaries +( + cd $MBD/release + make DESTDIR=$RBR install +) + +# FIXME: at some point we should stop doing this and just install everything +# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming +# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax +mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/ + +# Install logrotate and autostart +install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql +install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql + +# Create a symlink "rcmysql", pointing to the init.script. SuSE users +# will appreciate that, as all services usually offer this. +ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql + +# Touch the place where the my.cnf config file might be located +# Just to make sure it's in the file list and marked as a config file +touch $RBR%{_sysconfdir}/my.cnf + +# Install SELinux files in datadir +install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \ + $RBR%{_datadir}/mysql/SELinux/RHEL4 + +%if %{WITH_TCMALLOC} +# Even though this is a shared library, put it under /usr/lib*/mysql, so it +# doesn't conflict with possible shared lib by the same name in /usr/lib*. See +# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used. +install -m 644 "%{malloc_lib_source}" \ + "$RBR%{_libdir}/mysql/%{malloc_lib_target}" +%endif + +# Remove man pages we explicitly do not want to package, avoids 'unpackaged +# files' warning. +# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* + +############################################################################## +# Post processing actions, i.e. when installed +############################################################################## + +%pre -n MySQL-server%{product_suffix} +# This is the code running at the beginning of a RPM upgrade action, +# before replacing the old files with the new ones. + +# ATTENTION: Parts of this are duplicated in the "triggerpostun" ! + +# There are users who deviate from the default file system layout. +# Check local settings to support them. +if [ -x %{_bindir}/my_print_defaults ] +then + mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` + PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'` +fi +if [ -z "$mysql_datadir" ] +then + mysql_datadir=%{mysqldatadir} +fi +if [ -z "$PID_FILE_PATT" ] +then + PID_FILE_PATT="$mysql_datadir/*.pid" +fi + +# Check if we can safely upgrade. An upgrade is only safe if it's from one +# of our RPMs in the same version family. + +# Handle both ways of spelling the capability. +installed=`rpm -q --whatprovides mysql-server 2> /dev/null` +if [ $? -ne 0 -o -z "$installed" ]; then + installed=`rpm -q --whatprovides MySQL-server 2> /dev/null` +fi +if [ $? -eq 0 -a -n "$installed" ]; then + installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names + vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` + version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` + myoldvendor='%{mysql_old_vendor}' + myvendor_2='%{mysql_vendor_2}' + myvendor='%{mysql_vendor}' + myversion='%{mysql_version}' + + old_family=`echo $version \ + | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'` + new_family=`echo $myversion \ + | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'` + + [ -z "$vendor" ] && vendor='' + [ -z "$old_family" ] && old_family="" + [ -z "$new_family" ] && new_family="" + + error_text= + if [ "$vendor" != "$myoldvendor" \ + -a "$vendor" != "$myvendor_2" \ + -a "$vendor" != "$myvendor" ]; then + error_text="$error_text +The current MySQL server package is provided by a different +vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor. +Some files may be installed to different locations, including log +files and the service startup script in %{_sysconfdir}/init.d/. +" + fi + + if [ "$old_family" != "$new_family" ]; then + error_text="$error_text +Upgrading directly from MySQL $old_family to MySQL $new_family may not +be safe in all cases. A manual dump and restore using mysqldump is +recommended. It is important to review the MySQL manual's Upgrading +section for version-specific incompatibilities. +" + fi + + if [ -n "$error_text" ]; then + cat <&2 + +****************************************************************** +A MySQL server package ($installed) is installed. +$error_text +A manual upgrade is required. + +- Ensure that you have a complete, working backup of your data and my.cnf + files +- Shut down the MySQL server cleanly +- Remove the existing MySQL packages. Usually this command will + list the packages you should remove: + rpm -qa | grep -i '^mysql-' + + You may choose to use 'rpm --nodeps -ev ' to remove + the package which contains the mysqlclient shared library. The + library will be reinstalled by the MySQL-shared-compat package. +- Install the new MySQL packages supplied by $myvendor +- Ensure that the MySQL server is started +- Run the 'mysql_upgrade' program + +This is a brief description of the upgrade process. Important details +can be found in the MySQL manual, in the Upgrading section. +****************************************************************** +HERE + exit 1 + fi +fi + +# We assume that if there is exactly one ".pid" file, +# it contains the valid PID of a running MySQL server. +NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l` +case $NR_PID_FILES in + 0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server + 1 ) SERVER_TO_START='true' ;; + * ) SERVER_TO_START='' # Situation not clear + SEVERAL_PID_FILES=true ;; +esac +# That logic may be debated: We might check whether it is non-empty, +# contains exactly one number (possibly a PID), and whether "ps" finds it. +# OTOH, if there is no such process, it means a crash without a cleanup - +# is that a reason not to start a new server after upgrade? + +STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER + +if [ -f "$STATUS_FILE" ]; then + echo "Some previous upgrade was not finished:" + ls -ld $STATUS_FILE + echo "Please check its status, then do" + echo " rm $STATUS_FILE" + echo "before repeating the MySQL upgrade." + exit 1 +elif [ -n "$SEVERAL_PID_FILES" ] ; then + echo "You have more than one PID file:" + ls -ld $PID_FILE_PATT + echo "Please check which one (if any) corresponds to a running server" + echo "and delete all others before repeating the MySQL upgrade." + exit 1 +fi + +NEW_VERSION=%{mysql_version}-%{release} + +# The "pre" section code is also run on a first installation, +# when there is no data directory yet. Protect against error messages. +# Check for the existence of subdirectory "mysql/", the database of system +# tables like "mysql.user". +if [ -d $mysql_datadir/mysql ] ; then + echo "MySQL RPM upgrade to version $NEW_VERSION" > $STATUS_FILE + echo "'pre' step running at `date`" >> $STATUS_FILE + echo >> $STATUS_FILE + fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l` + if [ $fcount -gt 0 ] ; then + echo "ERR file(s):" >> $STATUS_FILE + ls -ltr $mysql_datadir/*.err >> $STATUS_FILE + echo >> $STATUS_FILE + echo "Latest 'Version' line in latest file:" >> $STATUS_FILE + grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \ + tail -1 >> $STATUS_FILE + echo >> $STATUS_FILE + fi + + if [ -n "$SERVER_TO_START" ] ; then + # There is only one PID file, race possibility ignored + echo "PID file:" >> $STATUS_FILE + ls -l $PID_FILE_PATT >> $STATUS_FILE + cat $PID_FILE_PATT >> $STATUS_FILE + echo >> $STATUS_FILE + echo "Server process:" >> $STATUS_FILE + ps -fp `cat $PID_FILE_PATT` >> $STATUS_FILE + echo >> $STATUS_FILE + echo "SERVER_TO_START=$SERVER_TO_START" >> $STATUS_FILE + else + # Take a note we checked it ... + echo "PID file:" >> $STATUS_FILE + ls -l $PID_FILE_PATT >> $STATUS_FILE 2>&1 + fi +fi + +# Shut down a previously installed server first +# Note we *could* make that depend on $SERVER_TO_START, but we rather don't, +# so a "stop" is attempted even if there is no PID file. +# (Maybe the "stop" doesn't work then, but we might fix that in itself.) +if [ -x %{_sysconfdir}/init.d/mysql ] ; then + %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1 + echo "Giving mysqld 5 seconds to exit nicely" + sleep 5 +fi + +%post -n MySQL-server%{product_suffix} +# This is the code running at the end of a RPM install or upgrade action, +# after the (new) files have been written. + +# ATTENTION: Parts of this are duplicated in the "triggerpostun" ! + +# There are users who deviate from the default file system layout. +# Check local settings to support them. +if [ -x %{_bindir}/my_print_defaults ] +then + mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` +fi +if [ -z "$mysql_datadir" ] +then + mysql_datadir=%{mysqldatadir} +fi + +NEW_VERSION=%{mysql_version}-%{release} +STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER + +# ---------------------------------------------------------------------- +# Create data directory if needed, check whether upgrade or install +# ---------------------------------------------------------------------- +if [ ! -d "$mysql_datadir" ] ; then mkdir -m 755 "$mysql_datadir" ; fi +if [ -f "$STATUS_FILE" ] ; then + SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` +else + SERVER_TO_START='' +fi +# echo "Analyzed: SERVER_TO_START=$SERVER_TO_START" +if [ ! -d $mysql_datadir/mysql ] ; then + mkdir $mysql_datadir/mysql $mysql_datadir/test + echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE +else + # If the directory exists, we may assume it is an upgrade. + echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE +fi + +# ---------------------------------------------------------------------- +# Make MySQL start/shutdown automatically when the machine does it. +# ---------------------------------------------------------------------- +# NOTE: This still needs to be debated. Should we check whether these links +# for the other run levels exist(ed) before the upgrade? +# use chkconfig on Enterprise Linux and newer SuSE releases +if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig --add mysql +# use insserv for older SuSE Linux versions +elif [ -x /sbin/insserv ] ; then + /sbin/insserv %{_sysconfdir}/init.d/mysql +fi + +# ---------------------------------------------------------------------- +# Create a MySQL user and group. Do not report any problems if it already +# exists. +# ---------------------------------------------------------------------- +groupadd -r %{mysqld_group} 2> /dev/null || true +useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \ + -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true +# The user may already exist, make sure it has the proper group nevertheless +# (BUG#12823) +usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true + +# ---------------------------------------------------------------------- +# Change permissions so that the user that will run the MySQL daemon +# owns all database files. +# ---------------------------------------------------------------------- +chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir + +# ---------------------------------------------------------------------- +# Initiate databases if needed +# ---------------------------------------------------------------------- +if ! grep '^MySQL RPM upgrade' $STATUS_FILE >/dev/null 2>&1 ; then + # Fix bug#45415: no "mysql_install_db" on an upgrade + # Do this as a negative to err towards more "install" runs + # rather than to miss one. + %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user} --random-passwords + + # Attention: Now 'root' is the only database user, + # its password is a random value found in ~/.mysql_secret, + # and the "password expired" flag is set: + # Any client needs that password, and the first command + # executed must be a new "set password"! +fi + +# ---------------------------------------------------------------------- +# Upgrade databases if needed would go here - but it cannot be automated yet +# ---------------------------------------------------------------------- + +# ---------------------------------------------------------------------- +# Change permissions again to fix any new files. +# ---------------------------------------------------------------------- +chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir + +# ---------------------------------------------------------------------- +# Fix permissions for the permission database so that only the user +# can read them. +# ---------------------------------------------------------------------- +chmod -R og-rw $mysql_datadir/mysql + +# ---------------------------------------------------------------------- +# install SELinux files - but don't override existing ones +# ---------------------------------------------------------------------- +SETARGETDIR=/etc/selinux/targeted/src/policy +SEDOMPROG=$SETARGETDIR/domains/program +SECONPROG=$SETARGETDIR/file_contexts/program +if [ -f /etc/redhat-release ] \ + && (grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \ + || grep -q "CentOS release 4" /etc/redhat-release) ; then + echo + echo + echo 'Notes regarding SELinux on this platform:' + echo '=========================================' + echo + echo 'The default policy might cause server startup to fail because it is' + echo 'not allowed to access critical files. In this case, please update' + echo 'your installation.' + echo + echo 'The default policy might also cause inavailability of SSL related' + echo 'features because the server is not allowed to access /dev/random' + echo 'and /dev/urandom. If this is a problem, please do the following:' + echo + echo ' 1) install selinux-policy-targeted-sources from your OS vendor' + echo ' 2) add the following two lines to '$SEDOMPROG/mysqld.te':' + echo ' allow mysqld_t random_device_t:chr_file read;' + echo ' allow mysqld_t urandom_device_t:chr_file read;' + echo ' 3) cd to '$SETARGETDIR' and issue the following command:' + echo ' make load' + echo + echo +fi + +if [ -x sbin/restorecon ] ; then + sbin/restorecon -R var/lib/mysql +fi + +# Was the server running before the upgrade? If so, restart the new one. +if [ "$SERVER_TO_START" = "true" ] ; then + # Restart in the same way that mysqld will be started normally. + if [ -x %{_sysconfdir}/init.d/mysql ] ; then + %{_sysconfdir}/init.d/mysql start + echo "Giving mysqld 5 seconds to start" + sleep 5 + fi +fi + +# Collect an upgrade history ... +echo "Upgrade/install finished at `date`" >> $STATUS_FILE +echo >> $STATUS_FILE +echo "=====" >> $STATUS_FILE +STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY +cat $STATUS_FILE >> $STATUS_HISTORY +mv -f $STATUS_FILE ${STATUS_FILE}-LAST # for "triggerpostun" + + +#echo "Thank you for installing the MySQL Community Server! For Production +#systems, we recommend MySQL Enterprise, which contains enterprise-ready +#software, intelligent advisory services, and full production support with +#scheduled service packs and more. Visit www.mysql.com/enterprise for more +#information." + +%preun -n MySQL-server%{product_suffix} + +# Which '$1' does this refer to? Fedora docs have info: +# " ... a count of the number of versions of the package that are installed. +# Action Count +# Install the first time 1 +# Upgrade 2 or higher (depending on the number of versions installed) +# Remove last version of package 0 " +# +# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html + +if [ $1 = 0 ] ; then + # Stop MySQL before uninstalling it + if [ -x %{_sysconfdir}/init.d/mysql ] ; then + %{_sysconfdir}/init.d/mysql stop > /dev/null + # Remove autostart of MySQL + # use chkconfig on Enterprise Linux and newer SuSE releases + if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig --del mysql + # For older SuSE Linux versions + elif [ -x /sbin/insserv ] ; then + /sbin/insserv -r %{_sysconfdir}/init.d/mysql + fi + fi +fi + +# We do not remove the mysql user since it may still own a lot of +# database files. + +%triggerpostun -n MySQL-server%{product_suffix} --MySQL-server-community + +# Setup: We renamed this package, so any existing "server-community" +# package will be removed when this "server" is installed. +# Problem: RPM will first run the "pre" and "post" sections of this script, +# and only then the "preun" of that old community server. +# But this "preun" includes stopping the server and uninstalling the service, +# "chkconfig --del mysql" which removes the symlinks to the start script. +# Solution: *After* the community server got removed, restart this server +# and re-install the service. +# +# For information about triggers in spec files, see the Fedora docs: +# http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html +# For all details of this code, see the "pre" and "post" sections. + +# There are users who deviate from the default file system layout. +# Check local settings to support them. +if [ -x %{_bindir}/my_print_defaults ] +then + mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | tail -1 | sed -n 's/--datadir=//p'` +fi +if [ -z "$mysql_datadir" ] +then + mysql_datadir=%{mysqldatadir} +fi + +NEW_VERSION=%{mysql_version}-%{release} +STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST # Note the difference! +STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY + +if [ -f "$STATUS_FILE" ] ; then + SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-` +else + # This should never happen, but let's be prepared + SERVER_TO_START='' +fi +echo "Analyzed: SERVER_TO_START=$SERVER_TO_START" + +if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig --add mysql +# use insserv for older SuSE Linux versions +elif [ -x /sbin/insserv ] ; then + /sbin/insserv %{_sysconfdir}/init.d/mysql +fi + +# Was the server running before the upgrade? If so, restart the new one. +if [ "$SERVER_TO_START" = "true" ] ; then + # Restart in the same way that mysqld will be started normally. + if [ -x %{_sysconfdir}/init.d/mysql ] ; then + %{_sysconfdir}/init.d/mysql start + echo "Giving mysqld 5 seconds to start" + sleep 5 + fi +fi + +echo "Trigger 'postun --community' finished at `date`" >> $STATUS_HISTORY +echo >> $STATUS_HISTORY +echo "=====" >> $STATUS_HISTORY + + +# ---------------------------------------------------------------------- +# Clean up the BuildRoot after build is done +# ---------------------------------------------------------------------- +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ + && rm -rf $RPM_BUILD_ROOT; + +############################################################################## +# Files section +############################################################################## + +%files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files +%defattr(-,root,root,0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +%doc %{src_dir}/Docs/ChangeLog +%doc %{src_dir}/Docs/INFO_SRC* +%doc release/Docs/INFO_BIN* +%doc release/support-files/my-default.cnf + +%if 0%{?commercial} +%doc %attr(644, root, root) %{_infodir}/mysql.info* +%endif + +%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* +%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* +%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1* +%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* +%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* +%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1* +%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* +%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1* +%doc %attr(644, root, man) %{_mandir}/man1/perror.1* +%doc %attr(644, root, man) %{_mandir}/man1/replace.1* +%doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* +%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* + +%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf +%dir %{_sysconfdir}/my.cnf.d + +%attr(755, root, root) %{_bindir}/innochecksum +%attr(755, root, root) %{_bindir}/my_print_defaults +%attr(755, root, root) %{_bindir}/myisam_ftdump +%attr(755, root, root) %{_bindir}/myisamchk +%attr(755, root, root) %{_bindir}/myisamlog +%attr(755, root, root) %{_bindir}/myisampack +%attr(755, root, root) %{_bindir}/mysql_convert_table_format +%attr(755, root, root) %{_bindir}/mysql_fix_extensions +%attr(755, root, root) %{_bindir}/mysql_install_db +%attr(755, root, root) %{_bindir}/mysql_plugin +%attr(755, root, root) %{_bindir}/mysql_secure_installation +%attr(755, root, root) %{_bindir}/mysql_setpermission +%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql +%attr(755, root, root) %{_bindir}/mysql_upgrade +%attr(755, root, root) %{_bindir}/mysql_zap +%attr(755, root, root) %{_bindir}/mysqlbug +%attr(755, root, root) %{_bindir}/mysqld_multi +%attr(755, root, root) %{_bindir}/mysqld_safe +%attr(755, root, root) %{_bindir}/mysqldumpslow +%attr(755, root, root) %{_bindir}/mysqlhotcopy +%attr(755, root, root) %{_bindir}/mysqltest +%attr(755, root, root) %{_bindir}/perror +%attr(755, root, root) %{_bindir}/replace +%attr(755, root, root) %{_bindir}/resolve_stack_dump +%attr(755, root, root) %{_bindir}/resolveip + +%attr(755, root, root) %{_sbindir}/mysqld +%attr(755, root, root) %{_sbindir}/mysqld-debug +%attr(755, root, root) %{_sbindir}/rcmysql +%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini + +%if %{WITH_TCMALLOC} +%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} +%endif + +%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql +%attr(755, root, root) %{_sysconfdir}/init.d/mysql +%attr(755, root, root) %{_datadir}/mysql/ +%dir %attr(755, mysql, mysql) /var/lib/mysql + +# ---------------------------------------------------------------------------- +%files -n MySQL-client%{product_suffix} +%defattr(-, root, root, 0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +%attr(755, root, root) %{_bindir}/msql2mysql +%attr(755, root, root) %{_bindir}/mysql +%attr(755, root, root) %{_bindir}/mysql_find_rows +%attr(755, root, root) %{_bindir}/mysql_waitpid +%attr(755, root, root) %{_bindir}/mysqlaccess +# XXX: This should be moved to %{_sysconfdir} +%attr(644, root, root) %{_bindir}/mysqlaccess.conf +%attr(755, root, root) %{_bindir}/mysqladmin +%attr(755, root, root) %{_bindir}/mysqlbinlog +%attr(755, root, root) %{_bindir}/mysqlcheck +%attr(755, root, root) %{_bindir}/mysqldump +%attr(755, root, root) %{_bindir}/mysqlimport +%attr(755, root, root) %{_bindir}/mysqlshow +%attr(755, root, root) %{_bindir}/mysqlslap +%attr(755, root, root) %{_bindir}/mysql_config_editor + +%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_config_editor.1* + +# ---------------------------------------------------------------------------- +%files -n MySQL-devel%{product_suffix} -f optional-files-devel +%defattr(-, root, root, 0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* +%attr(755, root, root) %{_bindir}/mysql_config +%dir %attr(755, root, root) %{_includedir}/mysql +%dir %attr(755, root, root) %{_libdir}/mysql +%{_includedir}/mysql/* +%{_datadir}/aclocal/mysql.m4 +%{_libdir}/mysql/libmysqlclient.a +%{_libdir}/mysql/libmysqlclient_r.a +%{_libdir}/mysql/libmysqlservices.a + +# ---------------------------------------------------------------------------- +%files -n MySQL-shared%{product_suffix} +%defattr(-, root, root, 0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +# Shared libraries (omit for architectures that don't support them) +%{_libdir}/libmysql*.so* + +%post -n MySQL-shared%{product_suffix} +/sbin/ldconfig + +%postun -n MySQL-shared%{product_suffix} +/sbin/ldconfig + +# ---------------------------------------------------------------------------- +%files -n MySQL-test%{product_suffix} +%defattr(-, root, root, 0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +%attr(-, root, root) %{_datadir}/mysql-test +%attr(755, root, root) %{_bindir}/mysql_client_test +%attr(755, root, root) %{_bindir}/mysql_client_test_embedded +%attr(755, root, root) %{_bindir}/mysqltest_embedded +%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* + +# ---------------------------------------------------------------------------- +%files -n MySQL-embedded%{product_suffix} +%defattr(-, root, root, 0755) +%if %{defined license_files_server} +%doc %{license_files_server} +%endif +%attr(755, root, root) %{_bindir}/mysql_embedded +%attr(644, root, root) %{_libdir}/mysql/libmysqld.a +%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a + +############################################################################## +# The spec file changelog only includes changes made to the spec file +# itself - note that they must be ordered by date (important when +# merging BK trees) +############################################################################## +%changelog +* Mon Oct 06 2014 Balasubramanian Kandasamy +- Add license info in each subpackage + +* Wed May 28 2014 Balasubramanian Kandasamy +- Updated usergroup to mysql on datadir + +* Wed Oct 30 2013 Balasubramanian Kandasamy +- Removed non gpl file docs/mysql.info from community packages + +* Mon Sep 09 2013 Balasubramanian Kandasamy +- Updated logic to get the correct count of PID files + +* Fri Aug 16 2013 Balasubramanian Kandasamy +- Added provides lowercase mysql tags + +* Wed Jun 26 2013 Balasubramanian Kandasamy +- Cleaned up spec file to resolve rpm dependencies. + +* Mon Nov 05 2012 Joerg Bruehe + +- Allow to override the default to use the bundled yaSSL by an option like + --define="with_ssl /path/to/ssl" + +* Wed Oct 10 2012 Bjorn Munch + +- Replace old my-*.cnf config file examples with template my-default.cnf + +* Fri Oct 05 2012 Joerg Bruehe + +- Let the installation use the new option "--random-passwords" of "mysql_install_db". + (Bug# 12794345 Ensure root password) +- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence + of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff). + +* Tue Jul 24 2012 Joerg Bruehe + +- Add a macro "runselftest": + if set to 1 (default), the test suite will be run during the RPM build; + this can be oveeridden via the command line by adding + --define "runselftest 0" + Failures of the test suite will NOT make the RPM build fail! + +* Mon Jul 16 2012 Joerg Bruehe + +- Add the man page for the "mysql_config_editor". + +* Mon Jun 11 2012 Joerg Bruehe + +- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging. + +* Wed Feb 29 2012 Brajmohan Saxena + +- Removal all traces of the readline library from mysql (BUG 13738013) + +* Wed Sep 28 2011 Joerg Bruehe + +- Fix duplicate mentioning of "mysql_plugin" and its manual page, + it is better to keep alphabetic order in the files list (merging!). + +* Wed Sep 14 2011 Joerg Bruehe + +- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace + the RPMs of any configuration (of the current or the preceding release series) + by the new ones. This is done by not using the implicitly generated capabilities + (which include the configuration name) and relying on more generic ones which + just list the function ("server", "client", ...). + The implicit generation cannot be prevented, so all these capabilities must be + explicitly listed in "Obsoletes:" + +* Tue Sep 13 2011 Jonathan Perkin + +- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to + changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install) + this necessitated a move of the libmygcc.a installation to the install + phase, which is probably where it belonged in the first place. + +* Tue Sep 13 2011 Joerg Bruehe + +- "make_win_bin_dist" and its manual are dropped, cmake does it different. + +* Thu Sep 08 2011 Daniel Fischer + +- Add mysql_plugin man page. + +* Tue Aug 30 2011 Tor Didriksen + +- Set CXX=g++ by default to add a dependency on libgcc/libstdc++. + Also, remove the use of the -fno-exceptions and -fno-rtti flags. + TODO: update distro_buildreq/distro_requires + +* Tue Aug 30 2011 Joerg Bruehe + +- Add the manual page for "mysql_plugin" to the server package. + +* Fri Aug 19 2011 Joerg Bruehe + +- Null-upmerge the fix of bug#37165: This spec file is not affected. +- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}". + +* Fri Aug 12 2011 Daniel Fischer + +- Source plugin library files list from cmake-generated file. + +* Mon Jul 25 2011 Chuck Bell + +- Added the mysql_plugin client - enables or disables plugins. + +* Thu Jul 21 2011 Sunanda Menon + +- Fix bug#12561297: Added the MySQL embedded binary + +* Thu Jul 07 2011 Joerg Bruehe + +- Fix bug#45415: "rpm upgrade recreates test database" + Let the creation of the "test" database happen only during a new installation, + not in an RPM upgrade. + This affects both the "mkdir" and the call of "mysql_install_db". + +* Wed Feb 09 2011 Joerg Bruehe + +- Fix bug#56581: If an installation deviates from the default file locations + ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade) + should still work, and use these locations. + The problem was that the fix for bug#27072 did not check for local settings. + +* Mon Jan 31 2011 Joerg Bruehe + +- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN". + +* Tue Nov 23 2010 Jonathan Perkin + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too +- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing + a '-j' argument to make. + +* Mon Nov 1 2010 Georgi Kodinov + +- Added test authentication (WL#1054) plugin binaries + +* Wed Oct 6 2010 Georgi Kodinov + +- Added example external authentication (WL#1054) plugin binaries + +* Wed Aug 11 2010 Joerg Bruehe + +- With a recent spec file cleanup, names have changed: A "-community" part was dropped. + Reflect that in the "Obsoletes" specifications. +- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM. +- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade". + +* Tue Jun 15 2010 Joerg Bruehe + +- Change the behaviour on installation and upgrade: + On installation, do not autostart the server. + *Iff* the server was stopped before the upgrade is started, this is taken as a + sign the administrator is handling that manually, and so the new server will + not be started automatically at the end of the upgrade. + The start/stop scripts will still be installed, so the server will be started + on the next machine boot. + This is the 5.5 version of fixing bug#27072 (RPM autostarting the server). + +* Tue Jun 1 2010 Jonathan Perkin + +- Implement SELinux checks from distribution-specific spec file. + +* Wed May 12 2010 Jonathan Perkin + +- Large number of changes to build using CMake +- Introduce distribution-specific RPMs +- Drop debuginfo, build all binaries with debug/symbols +- Remove __os_install_post, use native macro +- Remove _unpackaged_files_terminate_build, make it an error to have + unpackaged files +- Remove cluster RPMs + +* Wed Mar 24 2010 Joerg Bruehe + +- Add "--with-perfschema" to the configure options. + +* Mon Mar 22 2010 Joerg Bruehe + +- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64", + mask "rmdir" return code 1. +- Remove "ha_example.*" files from the list, they aren't built. + +* Wed Mar 17 2010 Joerg Bruehe + +- Fix a wrong path name in handling the debug plugins. + +* Wed Mar 10 2010 Joerg Bruehe + +- Take the result of the debug plugin build and put it into the optimized tree, + so that it becomes part of the final installation; + include the files in the packlist. Part of the fixes for bug#49022. + +* Mon Mar 01 2010 Joerg Bruehe + +- Set "Oracle and/or its affiliates" as the vendor and copyright owner, + accept upgrading from packages showing MySQL or Sun as vendor. + +* Fri Feb 12 2010 Joerg Bruehe + +- Formatting changes: + Have a consistent structure of separator lines and of indentation + (8 leading blanks => tab). +- Introduce the variable "src_dir". +- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence + over "CC" ("CXX"). +- Drop the old "with_static" argument analysis, this is not supported + in 5.1 since ages. +- Introduce variables to control the handlers individually, as well + as other options. +- Use the new "--with-plugin" notation for the table handlers. +- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql" + was done back in 2002 already. +- Make "--with-zlib-dir=bundled" the default, add an option to disable it. +- Add missing manual pages to the file list. +- Improve the runtime check for "libgcc.a", protect it against being tried + with the Intel compiler "icc". + +* Mon Jan 11 2010 Joerg Bruehe + +- Change RPM file naming: + - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc". + - Release counts from 1, not 0. + +* Wed Dec 23 2009 Joerg Bruehe + +- The "semisync" plugin file name has lost its introductory "lib", + adapt the file lists for the subpackages. + This is a part missing from the fix for bug#48351. +- Remove the "fix_privilege_tables" manual, it does not exist in 5.5 + (and likely, the whole script will go, too). + +* Mon Nov 16 2009 Joerg Bruehe + +- Fix some problems with the directives around "tcmalloc" (experimental), + remove erroneous traces of the InnoDB plugin (that is 5.1 only). + +* Tue Oct 06 2009 Magnus Blaudd + +- Removed mysql_fix_privilege_tables + +* Fri Oct 02 2009 Alexander Nozdrin + +- "mysqlmanager" got removed from version 5.4, all references deleted. + +* Fri Aug 28 2009 Joerg Bruehe + +- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin. + +* Thu Aug 27 2009 Joerg Bruehe + +- This version does not contain the "Instance manager", "mysqlmanager": + Remove it from the spec file so that packaging succeeds. + +* Mon Aug 24 2009 Jonathan Perkin + +- Add conditionals for bundled zlib and innodb plugin + +* Fri Aug 21 2009 Jonathan Perkin + +- Install plugin libraries in appropriate packages. +- Disable libdaemon_example and ftexample plugins. + +* Thu Aug 20 2009 Jonathan Perkin + +- Update variable used for mysql-test suite location to match source. + +* Fri Nov 07 2008 Joerg Bruehe + +- Correct yesterday's fix, so that it also works for the last flag, + and fix a wrong quoting: un-quoted quote marks must not be escaped. + +* Thu Nov 06 2008 Kent Boortz + +- Removed "mysql_upgrade_shell" +- Removed some copy/paste between debug and normal build + +* Thu Nov 06 2008 Joerg Bruehe + +- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. + This should cover both gcc and icc flags. Fixes bug#40546. + +* Fri Aug 29 2008 Kent Boortz + +- Removed the "Federated" storage engine option, and enabled in all + +* Tue Aug 26 2008 Joerg Bruehe + +- Get rid of the "warning: Installed (but unpackaged) file(s) found:" + Some generated files aren't needed in RPMs: + - the "sql-bench/" subdirectory + Some files were missing: + - /usr/share/aclocal/mysql.m4 ("devel" subpackage) + - Manual "mysqlbug" ("server" subpackage) + - Program "innochecksum" and its manual ("server" subpackage) + - Manual "mysql_find_rows" ("client" subpackage) + - Script "mysql_upgrade_shell" ("client" subpackage) + - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage) + - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage) + +* Mon Mar 31 2008 Kent Boortz + +- Made the "Federated" storage engine an option +- Made the "Cluster" storage engine and sub packages an option + +* Wed Mar 19 2008 Joerg Bruehe + +- Add the man pages for "ndbd" and "ndb_mgmd". + +* Mon Feb 18 2008 Timothy Smith + +- Require a manual upgrade if the alread-installed mysql-server is + from another vendor, or is of a different major version. + +* Wed May 02 2007 Joerg Bruehe + +- "ndb_size.tmpl" is not needed any more, + "man1/mysql_install_db.1" lacked the trailing '*'. + +* Sat Apr 07 2007 Kent Boortz + +- Removed man page for "mysql_create_system_tables" + +* Wed Mar 21 2007 Daniel Fischer + +- Add debug server. + +* Mon Mar 19 2007 Daniel Fischer + +- Remove Max RPMs; the server RPMs contain a mysqld compiled with all + features that previously only were built into Max. + +* Fri Mar 02 2007 Joerg Bruehe + +- Add several man pages for NDB which are now created. + +* Fri Jan 05 2007 Kent Boortz + +- Put back "libmygcc.a", found no real reason it was removed. + +- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the + correct "libgcc.a" path is returned for the 32/64 bit architecture. + +* Mon Dec 18 2006 Joerg Bruehe + +- Fix the move of "mysqlmanager" to section 8: Directory name was wrong. + +* Thu Dec 14 2006 Joerg Bruehe + +- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" + in the server RPM. +- The "mysqlmanager" man page got moved from section 1 to 8. + +* Thu Nov 30 2006 Joerg Bruehe + +- Call "make install" using "benchdir_root=%%{_datadir}", + because that is affecting the regression test suite as well. + +* Thu Nov 16 2006 Joerg Bruehe + +- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) + replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading + (bug#22081). + +* Mon Nov 13 2006 Joerg Bruehe + +- Add "--with-partition" to all server builds. + +- Use "--report-features" in one test run per server build. + +* Tue Aug 15 2006 Joerg Bruehe + +- The "max" server is removed from packages, effective from 5.1.12-beta. + Delete all steps to build, package, or install it. + +* Mon Jul 10 2006 Joerg Bruehe + +- Fix a typing error in the "make" target for the Perl script to run the tests. + +* Tue Jul 04 2006 Joerg Bruehe + +- Use the Perl script to run the tests, because it will automatically check + whether the server is configured with SSL. + +* Tue Jun 27 2006 Joerg Bruehe + +- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216) + +- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade, + there are some more aspects which need to be solved before this is possible. + For now, just ensure the binary "mysql_upgrade" is delivered and installed. + +* Thu Jun 22 2006 Joerg Bruehe + +- Close a gap of the previous version by explicitly using + a newly created temporary directory for the socket to be used + in the "mysql_upgrade" operation, overriding any local setting. + +* Tue Jun 20 2006 Joerg Bruehe + +- To run "mysql_upgrade", we need a running server; + start it in isolation and skip password checks. + +* Sat May 20 2006 Kent Boortz + +- Always compile for PIC, position independent code. + +* Wed May 10 2006 Kent Boortz + +- Use character set "all" when compiling with Cluster, to make Cluster + nodes independent on the character set directory, and the problem + that two RPM sub packages both wants to install this directory. + +* Mon May 01 2006 Kent Boortz + +- Use "./libtool --mode=execute" instead of searching for the + executable in current directory and ".libs". + +* Fri Apr 28 2006 Kent Boortz + +- Install and run "mysql_upgrade" + +* Wed Apr 12 2006 Jim Winstead + +- Remove sql-bench, and MySQL-bench RPM (will be built as an independent + project from the mysql-bench repository) + +* Tue Apr 11 2006 Jim Winstead + +- Remove old mysqltestmanager and related programs +* Sat Apr 01 2006 Kent Boortz + +- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS + +* Tue Mar 07 2006 Kent Boortz + +- Changed product name from "Community Edition" to "Community Server" + +* Mon Mar 06 2006 Kent Boortz + +- Fast mutexes is now disabled by default, but should be + used in Linux builds. + +* Mon Feb 20 2006 Kent Boortz + +- Reintroduced a max build +- Limited testing of 'debug' and 'max' servers +- Berkeley DB only in 'max' + +* Mon Feb 13 2006 Joerg Bruehe + +- Use "-i" on "make test-force"; + this is essential for later evaluation of this log file. + +* Thu Feb 09 2006 Kent Boortz + +- Pass '-static' to libtool, link static with our own libraries, dynamic + with system libraries. Link with the bundled zlib. + +* Wed Feb 08 2006 Kristian Nielsen + +- Modified RPM spec to match new 5.1 debug+max combined community packaging. + +* Sun Dec 18 2005 Kent Boortz + +- Added "client/mysqlslap" + +* Mon Dec 12 2005 Rodrigo Novo + +- Added zlib to the list of (static) libraries installed +- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) +- Compile MySQL with bundled zlib +- Fixed %%packager name to "MySQL Production Engineering Team" + +* Mon Dec 05 2005 Joerg Bruehe + +- Avoid using the "bundled" zlib on "shared" builds: + As it is not installed (on the build system), this gives dependency + problems with "libtool" causing the build to fail. + (Change was done on Nov 11, but left uncommented.) + +* Tue Nov 22 2005 Joerg Bruehe + +- Extend the file existence check for "init.d/mysql" on un-install + to also guard the call to "insserv"/"chkconfig". + +* Thu Oct 27 2005 Lenz Grimmer + +- added more man pages + +* Wed Oct 19 2005 Kent Boortz + +- Made yaSSL support an option (off by default) + +* Wed Oct 19 2005 Kent Boortz + +- Enabled yaSSL support + +* Sat Oct 15 2005 Kent Boortz + +- Give mode arguments the same way in all places +- Moved copy of mysqld.a to "standard" build, but + disabled it as we don't do embedded yet in 5.0 + +* Fri Oct 14 2005 Kent Boortz + +- For 5.x, always compile with --with-big-tables +- Copy the config.log file to location outside + the build tree + +* Fri Oct 14 2005 Kent Boortz + +- Removed unneeded/obsolete configure options +- Added archive engine to standard server +- Removed the embedded server from experimental server +- Changed suffix "-Max" => "-max" +- Changed comment string "Max" => "Experimental" + +* Thu Oct 13 2005 Lenz Grimmer + +- added a usermod call to assign a potential existing mysql user to the + correct user group (BUG#12823) +- Save the perror binary built during Max build so it supports the NDB + error codes (BUG#13740) +- added a separate macro "mysqld_group" to be able to define the + user group of the mysql user seperately, if desired. + +* Thu Sep 29 2005 Lenz Grimmer + +- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the + $RBR variable did not get expanded, thus leaving old build roots behind) + +* Thu Aug 04 2005 Lenz Grimmer + +- Fixed the creation of the mysql user group account in the postinstall + section (BUG 12348) +- Fixed enabling the Archive storage engine in the Max binary + +* Tue Aug 02 2005 Lenz Grimmer + +- Fixed the Requires: tag for the server RPM (BUG 12233) + +* Fri Jul 15 2005 Lenz Grimmer + +- create a "mysql" user group and assign the mysql user account to that group + in the server postinstall section. (BUG 10984) + +* Tue Jun 14 2005 Lenz Grimmer + +- Do not build statically on i386 by default, only when adding either "--with + static" or "--define '_with_static 1'" to the RPM build options. Static + linking really only makes sense when linking against the specially patched + glibc 2.2.5. + +* Mon Jun 06 2005 Lenz Grimmer + +- added mysql_client_test to the "bench" subpackage (BUG 10676) +- added the libndbclient static and shared libraries (BUG 10676) + +* Wed Jun 01 2005 Lenz Grimmer + +- use "mysqldatadir" variable instead of hard-coding the path multiple times +- use the "mysqld_user" variable on all occasions a user name is referenced +- removed (incomplete) Brazilian translations +- removed redundant release tags from the subpackage descriptions + +* Wed May 25 2005 Joerg Bruehe + +- Added a "make clean" between separate calls to "BuildMySQL". + +* Thu May 12 2005 Guilhem Bichot + +- Removed the mysql_tableinfo script made obsolete by the information schema + +* Wed Apr 20 2005 Lenz Grimmer + +- Enabled the "blackhole" storage engine for the Max RPM + +* Wed Apr 13 2005 Lenz Grimmer + +- removed the MySQL manual files (html/ps/texi) - they have been removed + from the MySQL sources and are now available seperately. + +* Mon Apr 4 2005 Petr Chardin + +- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into + mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively + +* Fri Mar 18 2005 Lenz Grimmer + +- Disabled RAID in the Max binaries once and for all (it has finally been + removed from the source tree) + +* Sun Feb 20 2005 Petr Chardin + +- Install MySQL Instance Manager together with mysqld, touch mysqlmanager + password file + +* Mon Feb 14 2005 Lenz Grimmer + +- Fixed the compilation comments and moved them into the separate build sections + for Max and Standard + +* Mon Feb 7 2005 Tomas Ulin + +- enabled the "Ndbcluster" storage engine for the max binary +- added extra make install in ndb subdir after Max build to get ndb binaries +- added packages for ndbcluster storage engine + +* Fri Jan 14 2005 Lenz Grimmer + +- replaced obsoleted "BuildPrereq" with "BuildRequires" instead + +* Thu Jan 13 2005 Lenz Grimmer + +- enabled the "Federated" storage engine for the max binary + +* Tue Jan 04 2005 Petr Chardin + +- ISAM and merge storage engines were purged. As well as appropriate + tools and manpages (isamchk and isamlog) + +* Fri Dec 31 2004 Lenz Grimmer + +- enabled the "Archive" storage engine for the max binary +- enabled the "CSV" storage engine for the max binary +- enabled the "Example" storage engine for the max binary + +* Thu Aug 26 2004 Lenz Grimmer + +- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860) + +* Fri Aug 20 2004 Lenz Grimmer + +- do not link statically on IA64/AMD64 as these systems do not have + a patched glibc installed + +* Tue Aug 10 2004 Lenz Grimmer + +- Added libmygcc.a to the devel subpackage (required to link applications + against the the embedded server libmysqld.a) (BUG 4921) + +* Mon Aug 09 2004 Lenz Grimmer + +- Added EXCEPTIONS-CLIENT to the "devel" package + +* Thu Jul 29 2004 Lenz Grimmer + +- disabled OpenSSL in the Max binaries again (the RPM packages were the + only exception to this anyway) (BUG 1043) + +* Wed Jun 30 2004 Lenz Grimmer + +- fixed server postinstall (mysql_install_db was called with the wrong + parameter) + +* Thu Jun 24 2004 Lenz Grimmer + +- added mysql_tzinfo_to_sql to the server subpackage +- run "make clean" instead of "make distclean" + +* Mon Apr 05 2004 Lenz Grimmer + +- added ncurses-devel to the build prerequisites (BUG 3377) + +* Thu Feb 12 2004 Lenz Grimmer + +- when using gcc, _always_ use CXX=gcc +- replaced Copyright with License field (Copyright is obsolete) + +* Tue Feb 03 2004 Lenz Grimmer + +- added myisam_ftdump to the Server package + +* Tue Jan 13 2004 Lenz Grimmer + +- link the mysql client against libreadline instead of libedit (BUG 2289) + +* Mon Dec 22 2003 Lenz Grimmer + +- marked /etc/logrotate.d/mysql as a config file (BUG 2156) + +* Sat Dec 13 2003 Lenz Grimmer + +- fixed file permissions (BUG 1672) + +* Thu Dec 11 2003 Lenz Grimmer + +- made testing for gcc3 a bit more robust + +* Fri Dec 05 2003 Lenz Grimmer + +- added missing file mysql_create_system_tables to the server subpackage + +* Fri Nov 21 2003 Lenz Grimmer + +- removed dependency on MySQL-client from the MySQL-devel subpackage + as it is not really required. (BUG 1610) + +* Fri Aug 29 2003 Lenz Grimmer + +- Fixed BUG 1162 (removed macro names from the changelog) +- Really fixed BUG 998 (disable the checking for installed but + unpackaged files) + +* Tue Aug 05 2003 Lenz Grimmer + +- Fixed BUG 959 (libmysqld not being compiled properly) +- Fixed BUG 998 (RPM build errors): added missing files to the + distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow, + mysql_fix_privilege_tables.1), removed "-n" from install section. + +* Wed Jul 09 2003 Lenz Grimmer + +- removed the GIF Icon (file was not included in the sources anyway) +- removed unused variable shared_lib_version +- do not run automake before building the standard binary + (should not be necessary) +- add server suffix '-standard' to standard binary (to be in line + with the binary tarball distributions) +- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir, + _datadir, _includedir) throughout the spec file. +- allow overriding CC and CXX (required when building with other compilers) + +* Fri May 16 2003 Lenz Grimmer + +- re-enabled RAID again + +* Wed Apr 30 2003 Lenz Grimmer + +- disabled MyISAM RAID (--with-raid) - it throws an assertion which + needs to be investigated first. + +* Mon Mar 10 2003 Lenz Grimmer + +- added missing file mysql_secure_installation to server subpackage + (BUG 141) + +* Tue Feb 11 2003 Lenz Grimmer + +- re-added missing pre- and post(un)install scripts to server subpackage +- added config file /etc/my.cnf to the file list (just for completeness) +- make sure to create the datadir with 755 permissions + +* Mon Jan 27 2003 Lenz Grimmer + +- removed unused CC and CXX variables +- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS + +* Fri Jan 24 2003 Lenz Grimmer + +- renamed package "MySQL" to "MySQL-server" +- fixed Copyright tag +- added mysql_waitpid to client subpackage (required for mysql-test-run) + +* Wed Nov 27 2002 Lenz Grimmer + +- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of + Linux distributions now support this scheme as proposed by the LSB either + directly or via a compatibility symlink) +- Use new "restart" init script action instead of starting and stopping + separately +- Be more flexible in activating the automatic bootup - use insserv (on + older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and + others) to create the respective symlinks + +* Wed Sep 25 2002 Lenz Grimmer + +- MySQL-Max now requires MySQL >= 4.0 to avoid version mismatches + (mixing 3.23 and 4.0 packages) + +* Fri Aug 09 2002 Lenz Grimmer + +- Turn off OpenSSL in MySQL-Max for now until it works properly again +- enable RAID for the Max binary instead +- added compatibility link: safe_mysqld -> mysqld_safe to ease the + transition from 3.23 + +* Thu Jul 18 2002 Lenz Grimmer + +- Reworked the build steps a little bit: the Max binary is supposed + to include OpenSSL, which cannot be linked statically, thus trying + to statically link against a special glibc is futile anyway +- because of this, it is not required to make yet another build run + just to compile the shared libs (saves a lot of time) +- updated package description of the Max subpackage +- clean up the BuildRoot directory afterwards + +* Mon Jul 15 2002 Lenz Grimmer + +- Updated Packager information +- Fixed the build options: the regular package is supposed to + include InnoDB and linked statically, while the Max package + should include BDB and SSL support + +* Fri May 03 2002 Lenz Grimmer + +- Use more RPM macros (e.g. infodir, mandir) to make the spec + file more portable +- reorganized the installation of documentation files: let RPM + take care of this +- reorganized the file list: actually install man pages along + with the binaries of the respective subpackage +- do not include libmysqld.a in the devel subpackage as well, if we + have a special "embedded" subpackage +- reworked the package descriptions + +* Mon Oct 8 2001 Monty + +- Added embedded server as a separate RPM + +* Fri Apr 13 2001 Monty + +- Added mysqld-max to the distribution + +* Tue Jan 2 2001 Monty + +- Added mysql-test to the bench package + +* Fri Aug 18 2000 Tim Smith + +- Added separate libmysql_r directory; now both a threaded + and non-threaded library is shipped. + +* Tue Sep 28 1999 David Axmark + +- Added the support-files/my-example.cnf to the docs directory. + +- Removed devel dependency on base since it is about client + development. + +* Wed Sep 8 1999 David Axmark + +- Cleaned up some for 3.23. + +* Thu Jul 1 1999 David Axmark + +- Added support for shared libraries in a separate sub + package. Original fix by David Fox (dsfox@cogsci.ucsd.edu) + +- The --enable-assembler switch is now automatically disables on + platforms there assembler code is unavailable. This should allow + building this RPM on non i386 systems. + +* Mon Feb 22 1999 David Axmark + +- Removed unportable cc switches from the spec file. The defaults can + now be overridden with environment variables. This feature is used + to compile the official RPM with optimal (but compiler version + specific) switches. + +- Removed the repetitive description parts for the sub rpms. Maybe add + again if RPM gets a multiline macro capability. + +- Added support for a pt_BR translation. Translation contributed by + Jorge Godoy . + +* Wed Nov 4 1998 David Axmark + +- A lot of changes in all the rpm and install scripts. This may even + be a working RPM :-) + +* Sun Aug 16 1998 David Axmark + +- A developers changelog for MySQL is available in the source RPM. And + there is a history of major user visible changed in the Reference + Manual. Only RPM specific changes will be documented here. diff -Nru mysql-5.6-5.6.31/support-files/mysql.server.sh mysql-5.6-5.6.33/support-files/mysql.server.sh --- mysql-5.6-5.6.31/support-files/mysql.server.sh 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/support-files/mysql.server.sh 2016-08-26 11:22:35.000000000 +0000 @@ -280,7 +280,7 @@ then # Give extra arguments to mysqld with the my.cnf file. This script # may be overwritten at next upgrade. - $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null 2>&1 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null & wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$? # Make lock for RedHat / SuSE diff -Nru mysql-5.6-5.6.31/tests/mysql_client_test.c mysql-5.6-5.6.33/tests/mysql_client_test.c --- mysql-5.6-5.6.31/tests/mysql_client_test.c 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/tests/mysql_client_test.c 2016-08-26 11:22:35.000000000 +0000 @@ -19488,6 +19488,77 @@ } +/* + Bug#22559575: "the statement (1) has no open cursor" pops + sometimes with prepared+query_cache +*/ + +static void bug22559575_base(unsigned long type) +{ + MYSQL_STMT *stmt; + int rc; + const char stmt_text[] ="SELECT a FROM t22559575"; + MYSQL_RES *prepare_meta = NULL; + MYSQL_BIND bind[1]; + short data; + unsigned long length; + + stmt = mysql_stmt_init(mysql); + check_stmt(stmt); + if (type == CURSOR_TYPE_READ_ONLY) + { + rc = mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*)&type); + check_execute(stmt, rc); + } + rc = mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + check_execute(stmt, rc); + prepare_meta = mysql_stmt_result_metadata(stmt); + DIE_UNLESS(prepare_meta != NULL); + rc= mysql_stmt_execute(stmt); + check_execute(stmt, rc); + + memset(bind, 0, sizeof(bind)); + bind[0].buffer_type= MYSQL_TYPE_SHORT; + bind[0].buffer= (void *)&data; + bind[0].length= &length; + rc= mysql_stmt_bind_result(stmt, bind); + check_execute(stmt, rc); + + rc= mysql_stmt_store_result(stmt); + check_execute(stmt, rc); + + rc= mysql_stmt_fetch(stmt); + check_execute(stmt, rc); + DIE_UNLESS(data == 1); + + mysql_free_result(prepare_meta); + rc= mysql_stmt_close(stmt); + check_execute(stmt, rc); +} + +static void test_bug22559575() +{ + int rc; + + rc= mysql_query(mysql, "CREATE TABLE t22559575(a SMALLINT)"); + myquery(rc); + rc= mysql_query(mysql, "INSERT INTO t22559575 VALUES (1)"); + myquery(rc); + + /* Should not cache */ + bug22559575_base(CURSOR_TYPE_READ_ONLY); + bug22559575_base(CURSOR_TYPE_READ_ONLY); + /* Should save to cache */ + bug22559575_base(CURSOR_TYPE_NO_CURSOR); + /* Should use cache */ + bug22559575_base(CURSOR_TYPE_NO_CURSOR); + /* should not use cache */ + bug22559575_base(CURSOR_TYPE_READ_ONLY); + + rc= mysql_query(mysql, "DROP TABLE t22559575"); + myquery(rc); +} + static struct my_tests_st my_tests[]= { { "disable_query_logs", disable_query_logs }, { "test_view_sp_list_fields", test_view_sp_list_fields }, @@ -19765,6 +19836,7 @@ { "test_bug17512527", test_bug17512527}, { "test_bug20810928", test_bug20810928 }, { "test_bug17883203", test_bug17883203 }, + { "test_bug22559575", test_bug22559575 }, { 0, 0 } }; diff -Nru mysql-5.6-5.6.31/unittest/CMakeLists.txt mysql-5.6-5.6.33/unittest/CMakeLists.txt --- mysql-5.6-5.6.31/unittest/CMakeLists.txt 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/unittest/CMakeLists.txt 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,8 +13,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +ADD_SUBDIRECTORY(gunit) + ADD_CUSTOM_TARGET( test-unit - COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/unit.pl run . + COMMAND ctest WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) diff -Nru mysql-5.6-5.6.31/unittest/gunit/yassl/CMakeLists.txt mysql-5.6-5.6.33/unittest/gunit/yassl/CMakeLists.txt --- mysql-5.6-5.6.31/unittest/gunit/yassl/CMakeLists.txt 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/unittest/gunit/yassl/CMakeLists.txt 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,3 +30,4 @@ ADD_EXECUTABLE(yassl-t yassl-t.cc) TARGET_LINK_LIBRARIES(yassl-t gunit_small sqlgunitlib strings dbug regex) TARGET_LINK_LIBRARIES(yassl-t ${LIBSOCKET}) +ADD_TEST(yassl yassl-t) diff -Nru mysql-5.6-5.6.31/unittest/README.txt mysql-5.6-5.6.33/unittest/README.txt --- mysql-5.6-5.6.31/unittest/README.txt 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/unittest/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ - -Unit tests directory structure ------------------------------- - -This is the current structure of the unit tests. More directories -will be added over time. - -mytap Source for the MyTAP library -mysys Tests for mysys components - base64-t.c Unit test for base64 encoding functions -examples Example unit tests. - core-t.c Example of raising a signal in the middle of the test - THIS TEST WILL STOP ALL FURTHER TESTING! - simple-t.c Example of a standard TAP unit test - skip-t.c Example where some test points are skipped - skip_all-t.c Example of a test where the entire test is skipped - todo-t.c Example where test contain test points that are TODO - no_plan-t.c Example of a test with no plan (avoid this) - - -Executing unit tests --------------------- - -To make and execute all unit tests in the directory: - - make test - -Observe that the tests in the examples/ directory are just various -examples of tests and are not expected to pass. - - -Adding unit tests ------------------ - -Add a file with a name of the format "foo-t.c" to the appropriate -directory and add the following to the Makefile.am in that directory -(where ... denotes stuff already there): - - noinst_PROGRAMS = ... foo-t - -Note, it's important to have "-t" at the end of the filename, otherwise the -test won't be executed by 'make test' ! - - -Documentation -------------- - -The generated documentation is temporarily placed at: - - http://www.kindahl.net/mytap/doc/ - -I will move it to a better place once I figure out where and how. diff -Nru mysql-5.6-5.6.31/unittest/unit.pl mysql-5.6-5.6.33/unittest/unit.pl --- mysql-5.6-5.6.31/unittest/unit.pl 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/unittest/unit.pl 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#!/usr/bin/perl -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -use File::Find; -use Getopt::Long; - -use strict; - -sub run_cmd (@); - -my %dispatch = ( - "run" => \&run_cmd, -); - -=head1 NAME - -unit - Run unit tests in directory - -=head1 SYNOPSIS - - unit [--[no]big] [--[no]verbose] run [tests to run] - -=cut - -my $big= $ENV{'MYTAP_CONFIG'} eq 'big'; - -my $opt_verbose; -my $result = GetOptions ( - "big!" => \$big, - "verbose!" => \$opt_verbose, -); - -$ENV{'MYTAP_CONFIG'} = $big ? 'big' : ''; - -my $cmd = shift; - -if (defined $cmd && exists $dispatch{$cmd}) { - $dispatch{$cmd}->(@ARGV); -} else { - print "Unknown command", (defined $cmd ? " $cmd" : ""), ".\n"; - print "Available commands are: ", join(", ", keys %dispatch), "\n"; -} - -=head2 run - -Run all unit tests in the current directory and all subdirectories. - -=cut - -BEGIN { - # Test::Harness have been extensively rewritten in newer perl - # versions and is now just a backward compatibility wrapper - # (with a bug causing the HARNESS_PERL_SWITCHES to be mangled) - # Prefer to use TAP::Harness directly if available - if (eval "use TAP::Harness; 1") { - eval 'sub NEW_HARNESS { 1 }'; - warn "using TAP::Harness"; - } else { - eval "use Test::Harness; 1" or die "couldn't find Test::Harness!"; - eval 'sub NEW_HARNESS { 0 }'; - } -} - -sub _find_test_files (@) { - my @dirs = @_; - my @files; - find sub { - $File::Find::prune = 1 if /^SCCS$/; - $File::Find::prune = 1 if /^.libs$/; - push(@files, $File::Find::name) if -x _ && (/-t\z/ || /-t\.exe\z/); - }, @dirs; - return @files; -} - -sub run_cmd (@) { - my @files; - - # If no directories were supplied, we add all directories in the - # current directory except 'mytap' since it is not part of the - # test suite. - if (@_ == 0) { - # Ignore these directories - my @ignore = qw(mytap SCCS); - - # Build an expression from the directories above that tests if a - # directory should be included in the list or not. - my $ignore = join(' && ', map { '$_ ne ' . "'$_'"} @ignore); - - # Open and read the directory. Filter out all files, hidden - # directories, and directories named above. - opendir(DIR, ".") or die "Cannot open '.': $!\n"; - @_ = grep { -d $_ && $_ !~ /^\..*/ && eval $ignore } readdir(DIR); - closedir(DIR); - } - - print "Running tests: @_\n"; - - foreach my $name (@_) { - push(@files, _find_test_files $name) if -d $name; - push(@files, $name) if -f $name; - } - - if (@files > 0) { - # Removing the first './' from the file names - foreach (@files) { s!^\./!! } - - if (NEW_HARNESS()) - { - my %args = ( exec => [ ], verbosity => $opt_verbose ); - my $harness = TAP::Harness->new( \%args ); - my $aggreg= $harness->runtests(@files); - # Signal failure to calling scripts - exit(1) if $aggreg->get_status() ne 'PASS'; - } - else - { - $ENV{'HARNESS_VERBOSE'} = $opt_verbose; - $ENV{'HARNESS_PERL_SWITCHES'} .= ' -e "exec @ARGV"'; - runtests(@files); - } - } -} - diff -Nru mysql-5.6-5.6.31/VERSION mysql-5.6-5.6.33/VERSION --- mysql-5.6-5.6.31/VERSION 2016-05-16 22:19:37.000000000 +0000 +++ mysql-5.6-5.6.33/VERSION 2016-08-26 11:22:35.000000000 +0000 @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=6 -MYSQL_VERSION_PATCH=31 +MYSQL_VERSION_PATCH=33 MYSQL_VERSION_EXTRA=