[Pkg-mysql-commits] r2223 - in mysql-5.5/branches/unstable/debian: . patches
Clint Byrum
spamaps-guest at alioth.debian.org
Mon May 6 06:20:45 UTC 2013
Author: spamaps-guest
Date: 2013-05-06 06:20:44 +0000 (Mon, 06 May 2013)
New Revision: 2223
Removed:
mysql-5.5/branches/unstable/debian/patches/yassl.patch
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/patches/1_hurd.patch
mysql-5.5/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
mysql-5.5/branches/unstable/debian/patches/62_disable_tests.patch
mysql-5.5/branches/unstable/debian/patches/70_mysql_va_list.patch
mysql-5.5/branches/unstable/debian/patches/71_disable_rpl_tests.patch
mysql-5.5/branches/unstable/debian/patches/72_fix_standalone_tests.patch
mysql-5.5/branches/unstable/debian/patches/93_kfreebsd_tests.patch
mysql-5.5/branches/unstable/debian/patches/94_spelling.patch
mysql-5.5/branches/unstable/debian/patches/debian-mdev382-fixup.patch
mysql-5.5/branches/unstable/debian/patches/regex_plus.patch
mysql-5.5/branches/unstable/debian/patches/series
mysql-5.5/branches/unstable/debian/patches/versioned_symbols.patch
Log:
SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
CVE-2013-2391 CVE-2013-1502
- Patches refreshed.
- d/p/yassl.patch - dropped, applied upstream
- d/p/debian-mdev382-fixup.patch: reduced to only test cases
added by MariaDB. The code has been fixed upstream.
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/changelog 2013-05-06 06:20:44 UTC (rev 2223)
@@ -1,6 +1,13 @@
-mysql-5.5 (5.5.31+dfsg-1) UNRELEASED; urgency=low
+mysql-5.5 (5.5.31+dfsg-1) UNRELEASED; urgency=high
* New upstream release.
+ SECURITY UPDATE: CVE-2013-2375 CVE-2013-1544 CVE-2013-1532
+ CVE-2013-2389 CVE-2013-2392 CVE-2013-2376 CVE-2013-1511
+ CVE-2013-2391 CVE-2013-1502
+ - Patches refreshed.
+ - d/p/yassl.patch - dropped, applied upstream
+ - d/p/debian-mdev382-fixup.patch: reduced to only test cases
+ added by MariaDB. The code has been fixed upstream.
-- Clint Byrum <clint at ubuntu.com> Sun, 05 May 2013 09:37:54 -0700
Modified: mysql-5.5/branches/unstable/debian/patches/1_hurd.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/1_hurd.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/1_hurd.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -4,10 +4,10 @@
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002
Last-Update: 2012-03-18
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/cmake/os/GNU.cmake
+Index: mysql-5.5-5.5.31+dfsg/cmake/os/GNU.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mysql-5.5.29/cmake/os/GNU.cmake 2013-01-02 15:38:08.271735374 -0800
++++ mysql-5.5-5.5.31+dfsg/cmake/os/GNU.cmake 2013-05-05 09:43:53.000000000 -0700
@@ -0,0 +1,20 @@
+# This file includes GNU/Hurd specific options and quirks, related to system checks
+
@@ -29,10 +29,10 @@
+
+# 64 bit file offset support flag
+SET(_FILE_OFFSET_BITS 64)
-Index: mysql-5.5.29/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/My/Platform.pm 2013-01-02 15:36:15.398353757 -0800
-+++ mysql-5.5.29/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:08.271735374 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/My/Platform.pm 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm 2013-05-05 23:04:39.000000000 -0700
@@ -110,6 +110,9 @@
# This may not be true, but we can't test for it on AIX due to Perl bug
# See Bug #45771
Modified: mysql-5.5/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -8,10 +8,10 @@
Last-Update: 2012-03-07
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/scripts/mysqld_safe.sh
+Index: mysql-5.5-5.5.31+dfsg/scripts/mysqld_safe.sh
===================================================================
---- mysql-5.5.29.orig/scripts/mysqld_safe.sh 2013-01-02 15:36:15.330357744 -0800
-+++ mysql-5.5.29/scripts/mysqld_safe.sh 2013-01-02 15:38:10.183623263 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/scripts/mysqld_safe.sh 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/scripts/mysqld_safe.sh 2013-05-05 09:43:53.000000000 -0700
@@ -29,8 +29,6 @@
syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe
Modified: mysql-5.5/branches/unstable/debian/patches/62_disable_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/62_disable_tests.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/62_disable_tests.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -3,10 +3,10 @@
Forwarded: not-needed
Last-Update: 2012-03-07
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Index: mysql-5.5.29/mysql-test/t/disabled.def
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/t/disabled.def
===================================================================
---- mysql-5.5.29.orig/mysql-test/t/disabled.def 2013-01-02 15:36:15.294359855 -0800
-+++ mysql-5.5.29/mysql-test/t/disabled.def 2013-01-02 15:38:11.455548678 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/t/disabled.def 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/t/disabled.def 2013-05-05 09:43:53.000000000 -0700
@@ -15,3 +15,8 @@
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
Modified: mysql-5.5/branches/unstable/debian/patches/70_mysql_va_list.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/70_mysql_va_list.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/70_mysql_va_list.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -4,10 +4,10 @@
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
Last-Update: 2012-10-24
-Index: mysql-5.5.29/sql-common/client_plugin.c
+Index: mysql-5.5-5.5.31+dfsg/sql-common/client_plugin.c
===================================================================
---- mysql-5.5.29.orig/sql-common/client_plugin.c 2013-01-02 15:36:15.258361966 -0800
-+++ mysql-5.5.29/sql-common/client_plugin.c 2013-01-02 15:38:12.035514668 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/sql-common/client_plugin.c 2013-03-25 06:14:58.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/sql-common/client_plugin.c 2013-05-05 09:43:53.000000000 -0700
@@ -233,11 +233,13 @@
{
MYSQL mysql;
Modified: mysql-5.5/branches/unstable/debian/patches/71_disable_rpl_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/71_disable_rpl_tests.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/71_disable_rpl_tests.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -3,12 +3,12 @@
Forwarded: no, not needed
Description: disables test to allow build to pass while this is investigated.
-Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/disabled.def
===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.338697730 -0800
-+++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.334697964 -0800
-@@ -14,3 +14,4 @@
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/disabled.def 2013-05-05 09:46:34.599476208 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/disabled.def 2013-05-05 09:47:10.385389482 -0700
+@@ -13,3 +13,4 @@
+ rpl_row_create_table : Bug#11759274 2010-02-27 andrei failed different way than earlier with bug#45576
rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
-+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
+++rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
Modified: mysql-5.5/branches/unstable/debian/patches/72_fix_standalone_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/72_fix_standalone_tests.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/72_fix_standalone_tests.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -4,10 +4,10 @@
Forwarded: not-needed
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
Last-Update: 2012-10-24
-Index: mysql-5.5.29/mysql-test/lib/mtr_cases.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/mtr_cases.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/mtr_cases.pm 2013-01-02 15:36:15.190365953 -0800
-+++ mysql-5.5.29/mysql-test/lib/mtr_cases.pm 2013-01-02 15:38:13.147449465 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/mtr_cases.pm 2013-05-05 09:47:48.135188277 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/mtr_cases.pm 2013-05-05 09:47:48.131188510 -0700
@@ -287,7 +287,8 @@
else
{
Modified: mysql-5.5/branches/unstable/debian/patches/93_kfreebsd_tests.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/93_kfreebsd_tests.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/93_kfreebsd_tests.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -5,10 +5,10 @@
file name truncation was barfing even for the shortened form.
Forwarded: no
Last-Update: 2012-04-28
-Index: mysql-5.5.29/mysql-test/lib/My/Platform.pm
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm
===================================================================
---- mysql-5.5.29.orig/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:08.271735374 -0800
-+++ mysql-5.5.29/mysql-test/lib/My/Platform.pm 2013-01-02 15:38:13.707416629 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/lib/My/Platform.pm 2013-05-05 09:47:48.155187111 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/lib/My/Platform.pm 2013-05-05 09:47:48.151187344 -0700
@@ -113,6 +113,8 @@
# Similarly the path length is hidden.
# See Debian bug #651002
Modified: mysql-5.5/branches/unstable/debian/patches/94_spelling.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/94_spelling.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/94_spelling.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -3,10 +3,10 @@
Preceeding -> preceding
Last-Update: 2012-10-24
Forwarded: no
-Index: mysql-5.5.29/libmysql/errmsg.c
+Index: mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c
===================================================================
---- mysql-5.5.29.orig/libmysql/errmsg.c 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/libmysql/errmsg.c 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/libmysql/errmsg.c 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c 2013-05-05 09:47:48.183185478 -0700
@@ -81,7 +81,7 @@
"Attempt to read a row while there is no result set associated with the statement",
"This feature is not implemented yet",
@@ -16,10 +16,10 @@
"The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
"This handle is already connected. Use a separate handle for each connection.",
"Authentication plugin '%s' cannot be loaded: %s",
-Index: mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_ddl.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.183185478 -0700
@@ -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.5.29/mysql-test/extra/rpl_tests/rpl_row_basic.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-01-02 15:38:14.355378634 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.183185478 -0700
@@ -221,7 +221,7 @@
SELECT * FROM t7 ORDER BY C1;
@@ -53,10 +53,10 @@
# temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT';
-Index: mysql-5.5.29/mysql-test/include/wait_until_count_sessions.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/include/wait_until_count_sessions.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/include/wait_until_count_sessions.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.183185478 -0700
@@ -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.5.29/mysql-test/suite/funcs_1/views/func_view.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/funcs_1/views/func_view.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/funcs_1/views/func_view.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.183185478 -0700
@@ -282,7 +282,7 @@
# other interesting value
# numbers -> 0
@@ -79,10 +79,10 @@
# FIXME enum, set ??
INSERT INTO t1_values SET
my_char_30 = ' ---äÖüß@µ*$-- ',
-Index: mysql-5.5.29/mysql-test/suite/funcs_1/views/views_master.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/funcs_1/views/views_master.inc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/funcs_1/views/views_master.inc 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.187185245 -0700
@@ -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.5.29/mysql-test/suite/rpl/t/rpl_ddl.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/rpl/t/rpl_ddl.test 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.187185245 -0700
@@ -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.5.29/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-01-02 15:38:14.359378400 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.187185245 -0700
@@ -239,7 +239,7 @@
UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
SELECT * FROM t1 ORDER BY a;
@@ -122,11 +122,11 @@
# temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT';
--echo **** On Master ****
-Index: mysql-5.5.29/sql/log_event.cc
+Index: mysql-5.5-5.5.31+dfsg/sql/log_event.cc
===================================================================
---- mysql-5.5.29.orig/sql/log_event.cc 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/sql/log_event.cc 2013-01-02 15:38:14.363378165 -0800
-@@ -3306,7 +3306,7 @@
+--- mysql-5.5-5.5.31+dfsg.orig/sql/log_event.cc 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/sql/log_event.cc 2013-05-05 09:47:48.000000000 -0700
+@@ -3312,7 +3312,7 @@
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
{
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
@@ -135,10 +135,10 @@
"the group log file/position: %s %s",
const_cast<Relay_log_info*>(rli)->group_master_log_name,
llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
-Index: mysql-5.5.29/storage/myisam/mi_rnext.c
+Index: mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c
===================================================================
---- mysql-5.5.29.orig/storage/myisam/mi_rnext.c 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/myisam/mi_rnext.c 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.219183379 -0700
@@ -64,7 +64,7 @@
Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything.
@@ -148,10 +148,10 @@
equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called.
*/
-Index: mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
===================================================================
---- mysql-5.5.29.orig/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.231182679 -0700
@@ -41,7 +41,7 @@
* Test returning descriptor information
*
@@ -161,10 +161,10 @@
* -# ???
*
* @return Zero, if test succeeded
-Index: mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
===================================================================
---- mysql-5.5.29.orig/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-01-02 15:36:15.118370174 -0800
-+++ mysql-5.5.29/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-01-02 15:38:14.363378165 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
++++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
@@ -41,7 +41,7 @@
* Test returning descriptor information
*
Modified: mysql-5.5/branches/unstable/debian/patches/debian-mdev382-fixup.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/debian-mdev382-fixup.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/debian-mdev382-fixup.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -13,32 +13,10 @@
handle updating sql_yacc.cc in out-of-tree builds properly, we have
included a regenerated sql_yacc.cc and sql_yacc.h.
-Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/r/rpl_mdev382.result
===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result 2013-03-12 12:06:41.000000000 -0700
-@@ -698,7 +698,7 @@
- master-bin.000001 # Intvar # # INSERT_ID=10
- master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
- master-bin.000001 # Intvar # # INSERT_ID=10
--master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`= @b + bug27417(2) ;file_id=#
-+master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @`b`) SET `b`= @b + bug27417(2) ;file_id=#
- master-bin.000001 # Query # # ROLLBACK
- /* the output must denote there is the query */;
- drop trigger trg_del_t2;
-@@ -950,7 +950,7 @@
- master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=#
- master-bin.000001 # Intvar # # INSERT_ID=10
- master-bin.000001 # User var # # @`b`=_latin1 0x3135 COLLATE latin1_swedish_ci
--master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @b) SET `b`= @b + bug27417(2) ;file_id=#
-+master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE `t4` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, @`b`) SET `b`= @b + bug27417(2) ;file_id=#
- master-bin.000001 # Query # # ROLLBACK
- drop trigger trg_del_t2;
- drop table t1,t2,t3,t4,t5;
-Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/r/rpl_mdev382.result
-===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/r/rpl_mdev382.result 2013-03-12 12:09:58.139823812 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/r/rpl_mdev382.result 2013-05-05 09:50:32.925579738 -0700
@@ -0,0 +1,330 @@
+include/master-slave.inc
+[connection master]
@@ -370,10 +348,10 @@
+use test;
+DROP DATABASE `db1``; select 'oops!'`;
+include/rpl_end.inc
-Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/rpl_mdev382.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_mdev382.test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/rpl_mdev382.test 2013-03-12 12:06:41.000000000 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_mdev382.test 2013-05-05 09:50:32.925579738 -0700
@@ -0,0 +1,256 @@
+--source include/have_innodb.inc
+--source include/have_binlog_format_statement.inc
@@ -631,21369 +609,3 @@
+DROP DATABASE `db1``; select 'oops!'`;
+
+--source include/rpl_end.inc
-Index: mysql-5.5-5.5.30+dfsg/mysys/mf_iocache2.c
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/mysys/mf_iocache2.c 2013-01-15 23:35:17.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/mysys/mf_iocache2.c 2013-03-12 12:06:41.000000000 -0700
-@@ -287,6 +287,40 @@
- }
-
-
-+static size_t
-+my_b_write_backtick_quote(IO_CACHE *info, const char *str, size_t len)
-+{
-+ const uchar *start;
-+ const uchar *p= (const uchar *)str;
-+ const uchar *end= p + len;
-+ size_t count;
-+ size_t total= 0;
-+
-+ if (my_b_write(info, (uchar *)"`", 1))
-+ return (size_t)-1;
-+ ++total;
-+ for (;;)
-+ {
-+ start= p;
-+ while (p < end && *p != '`')
-+ ++p;
-+ count= p - start;
-+ if (count && my_b_write(info, start, count))
-+ return (size_t)-1;
-+ total+= count;
-+ if (p >= end)
-+ break;
-+ if (my_b_write(info, (uchar *)"``", 2))
-+ return (size_t)-1;
-+ total+= 2;
-+ ++p;
-+ }
-+ if (my_b_write(info, (uchar *)"`", 1))
-+ return (size_t)-1;
-+ ++total;
-+ return total;
-+}
-+
- /*
- Simple printf version. Supports '%s', '%d', '%u', "%ld" and "%lu"
- Used for logging in MySQL
-@@ -311,6 +345,7 @@
- uint minimum_width_sign;
- uint precision; /* as yet unimplemented for anything but %b */
- my_bool is_zero_padded;
-+ my_bool backtick_quoting;
-
- /*
- Store the location of the beginning of a format directive, for the
-@@ -345,6 +380,7 @@
- fmt++;
-
- is_zero_padded= FALSE;
-+ backtick_quoting= FALSE;
- minimum_width_sign= 1;
- minimum_width= 0;
- precision= 0;
-@@ -357,6 +393,8 @@
- minimum_width_sign= -1; fmt++; goto process_flags;
- case '0':
- is_zero_padded= TRUE; fmt++; goto process_flags;
-+ case '`':
-+ backtick_quoting= TRUE; fmt++; goto process_flags;
- case '#':
- /** @todo Implement "#" conversion flag. */ fmt++; goto process_flags;
- case ' ':
-@@ -400,9 +438,19 @@
- reg2 char *par = va_arg(args, char *);
- size_t length2 = strlen(par);
- /* TODO: implement precision */
-- out_length+= length2;
-- if (my_b_write(info, (uchar*) par, length2))
-- goto err;
-+ if (backtick_quoting)
-+ {
-+ size_t total= my_b_write_backtick_quote(info, (uchar *) par, length2);
-+ if (total == (size_t)-1)
-+ goto err;
-+ out_length+= total;
-+ }
-+ else
-+ {
-+ out_length+= length2;
-+ if (my_b_write(info, (uchar*) par, length2))
-+ goto err;
-+ }
- }
- else if (*fmt == 'b') /* Sized buffer parameter, only precision makes sense */
- {
-Index: mysql-5.5-5.5.30+dfsg/sql/item.cc
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/item.cc 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/item.cc 2013-03-12 12:06:41.000000000 -0700
-@@ -792,15 +792,31 @@
- if (!my_charset_same(cs, system_charset_info))
- {
- size_t res_length;
-- name= sql_strmake_with_convert(str, name_length= length, cs,
-+ name= sql_strmake_with_convert(str, length, cs,
- MAX_ALIAS_NAME, system_charset_info,
- &res_length);
-+ name_length= res_length;
- }
- else
- name= sql_strmake(str, (name_length= min(length,MAX_ALIAS_NAME)));
- }
-
-
-+void Item::set_name_no_truncate(const char *str, uint length, CHARSET_INFO *cs)
-+{
-+ if (!my_charset_same(cs, system_charset_info))
-+ {
-+ size_t res_length;
-+ name= sql_strmake_with_convert(str, length, cs,
-+ UINT_MAX, system_charset_info,
-+ &res_length);
-+ name_length= res_length;
-+ }
-+ else
-+ name= sql_strmake(str, (name_length= length));
-+}
-+
-+
- /**
- @details
- This function is called when:
-Index: mysql-5.5-5.5.30+dfsg/sql/item_func.cc
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/item_func.cc 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/item_func.cc 2013-03-12 12:06:41.000000000 -0700
-@@ -5271,10 +5271,10 @@
- }
-
-
--void Item_user_var_as_out_param::print(String *str, enum_query_type query_type)
-+void Item_user_var_as_out_param::print_for_load(THD *thd, String *str)
- {
- str->append('@');
-- str->append(name.str,name.length);
-+ append_identifier(thd, str, name.str, name.length);
- }
-
-
-Index: mysql-5.5-5.5.30+dfsg/sql/item_func.h
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/item_func.h 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/item_func.h 2013-03-12 12:06:41.000000000 -0700
-@@ -1589,7 +1589,7 @@
- my_decimal *val_decimal(my_decimal *decimal_buffer);
- /* fix_fields() binds variable name with its entry structure */
- bool fix_fields(THD *thd, Item **ref);
-- virtual void print(String *str, enum_query_type query_type);
-+ void print_for_load(THD *thd, String *str);
- void set_null_value(CHARSET_INFO* cs);
- void set_value(const char *str, uint length, CHARSET_INFO* cs);
- };
-Index: mysql-5.5-5.5.30+dfsg/sql/item.h
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/item.h 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/item.h 2013-03-12 12:06:41.000000000 -0700
-@@ -588,6 +588,7 @@
- #endif
- } /*lint -e1509 */
- void set_name(const char *str, uint length, CHARSET_INFO *cs);
-+ void set_name_no_truncate(const char *str, uint length, CHARSET_INFO *cs);
- void rename(char *new_name);
- void init_make_field(Send_field *tmp_field,enum enum_field_types type);
- virtual void cleanup();
-Index: mysql-5.5-5.5.30+dfsg/sql/log_event.cc
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/log_event.cc 2013-03-12 12:06:41.000000000 -0700
-+++ mysql-5.5-5.5.30+dfsg/sql/log_event.cc 2013-03-12 12:06:41.000000000 -0700
-@@ -4367,9 +4367,9 @@
- uint Load_log_event::get_query_buffer_length()
- {
- return
-- //the DB name may double if we escape the quote character
-+ //the DB name and/or filename may double if we escape the quote character
- 5 + 2*db_len + 3 +
-- 18 + fname_len + 2 + // "LOAD DATA INFILE 'file''"
-+ 18 + 2*fname_len + 2 + // "LOAD DATA INFILE 'file''"
- 11 + // "CONCURRENT "
- 7 + // LOCAL
- 9 + // " REPLACE or IGNORE "
-@@ -4415,9 +4415,9 @@
-
- if (check_fname_outside_temp_buf())
- pos= strmov(pos, "LOCAL ");
-- pos= strmov(pos, "INFILE '");
-- memcpy(pos, fname, fname_len);
-- pos= strmov(pos+fname_len, "' ");
-+ pos= strmov(pos, "INFILE ");
-+ pos= pretty_print_str(pos, fname, fname_len);
-+ pos= strmov(pos, " ");
-
- if (sql_ex.opt_flags & REPLACE_FLAG)
- pos= strmov(pos, "REPLACE ");
-@@ -8937,7 +8937,7 @@
- {
- print_header(&print_event_info->head_cache, print_event_info, TRUE);
- my_b_printf(&print_event_info->head_cache,
-- "\tTable_map: `%s`.`%s` mapped to number %lu\n",
-+ "\tTable_map: %`s.%`s mapped to number %lu\n",
- m_dbnam, m_tblnam, m_table_id);
- print_base64(&print_event_info->body_cache, print_event_info, TRUE);
- }
-Index: mysql-5.5-5.5.30+dfsg/sql/sql_load.cc
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/sql_load.cc 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/sql_load.cc 2013-03-12 12:06:41.000000000 -0700
-@@ -718,7 +718,11 @@
- if (item->type() == Item::FIELD_ITEM)
- append_identifier(thd, &pfields, item->name, strlen(item->name));
- else
-- item->print(&pfields, QT_ORDINARY);
-+ {
-+ /* Actually Item_user_var_as_out_param despite claiming STRING_ITEM. */
-+ DBUG_ASSERT(item->type() == Item::STRING_ITEM);
-+ ((Item_user_var_as_out_param *)item)->print_for_load(thd, &pfields);
-+ }
- }
- pfields.append(")");
- }
-Index: mysql-5.5-5.5.30+dfsg/sql/sql_yacc.yy
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/sql_yacc.yy 2013-01-15 23:35:18.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/sql_yacc.yy 2013-03-12 12:06:41.000000000 -0700
-@@ -11657,7 +11657,7 @@
- if (lex->update_list.push_back($1) ||
- lex->value_list.push_back($4))
- MYSQL_YYABORT;
-- $4->set_name($3, (uint) ($5 - $3), YYTHD->charset());
-+ $4->set_name_no_truncate($3, (uint) ($5 - $3), YYTHD->charset());
- }
- ;
-
-Index: mysql-5.5-5.5.30+dfsg/sql/sql_yacc.cc
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/sql_yacc.cc 2013-01-15 23:35:32.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/sql_yacc.cc 2013-03-12 12:06:41.000000000 -0700
-@@ -1,10 +1,8 @@
-+/* A Bison parser, made by GNU Bison 2.5. */
-
--/* A Bison parser, made by GNU Bison 2.4.1. */
--
--/* Skeleton implementation for Bison's Yacc-like parsers in C
-+/* Bison implementation for Yacc-like parsers in C
-
-- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-- Free Software Foundation, Inc.
-+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-
- 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
-@@ -46,7 +44,7 @@
- #define YYBISON 1
-
- /* Bison version. */
--#define YYBISON_VERSION "2.4.1"
-+#define YYBISON_VERSION "2.5"
-
- /* Skeleton name. */
- #define YYSKELETON_NAME "yacc.c"
-@@ -75,8 +73,8 @@
-
- /* Copy the first part of user declarations. */
-
--/* Line 189 of yacc.c */
--#line 24 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 268 of yacc.c */
-+#line 24 "sql/sql_yacc.yy"
-
- /* thd is passed as an argument to yyparse(), and subsequently to yylex().
- ** The type will be void*, so it must be cast to (THD*) when used.
-@@ -784,8 +782,8 @@
-
-
-
--/* Line 189 of yacc.c */
--#line 789 "/export/home/pb2/build/sb_0-8129244-1358321449.66/dist_GPL/sql/sql_yacc.cc"
-+/* Line 268 of yacc.c */
-+#line 787 "sql/sql_yacc.cc"
-
- /* Enabling traces. */
- #ifndef YYDEBUG
-@@ -2003,8 +2001,8 @@
- typedef union YYSTYPE
- {
-
--/* Line 214 of yacc.c */
--#line 730 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 293 of yacc.c */
-+#line 730 "sql/sql_yacc.yy"
-
- int num;
- ulong ulong_num;
-@@ -2054,8 +2052,8 @@
-
-
-
--/* Line 214 of yacc.c */
--#line 2059 "/export/home/pb2/build/sb_0-8129244-1358321449.66/dist_GPL/sql/sql_yacc.cc"
-+/* Line 293 of yacc.c */
-+#line 2057 "sql/sql_yacc.cc"
- } YYSTYPE;
- # define YYSTYPE_IS_TRIVIAL 1
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
-@@ -2065,14 +2063,14 @@
-
- /* Copy the second part of user declarations. */
-
--/* Line 264 of yacc.c */
--#line 778 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 343 of yacc.c */
-+#line 778 "sql/sql_yacc.yy"
-
- bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
-
-
--/* Line 264 of yacc.c */
--#line 2076 "/export/home/pb2/build/sb_0-8129244-1358321449.66/dist_GPL/sql/sql_yacc.cc"
-+/* Line 343 of yacc.c */
-+#line 2074 "sql/sql_yacc.cc"
-
- #ifdef short
- # undef short
-@@ -2122,7 +2120,7 @@
- #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
- #ifndef YY_
--# if YYENABLE_NLS
-+# if defined YYENABLE_NLS && YYENABLE_NLS
- # if ENABLE_NLS
- # include <libintl.h> /* INFRINGES ON USER NAME SPACE */
- # define YY_(msgid) dgettext ("bison-runtime", msgid)
-@@ -2175,11 +2173,11 @@
- # define alloca _alloca
- # else
- # define YYSTACK_ALLOC alloca
--# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
- # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--# ifndef _STDLIB_H
--# define _STDLIB_H 1
-+# ifndef EXIT_SUCCESS
-+# define EXIT_SUCCESS 0
- # endif
- # endif
- # endif
-@@ -2202,24 +2200,24 @@
- # ifndef YYSTACK_ALLOC_MAXIMUM
- # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
- # endif
--# if (defined __cplusplus && ! defined _STDLIB_H \
-+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
- && ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
- # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--# ifndef _STDLIB_H
--# define _STDLIB_H 1
-+# ifndef EXIT_SUCCESS
-+# define EXIT_SUCCESS 0
- # endif
- # endif
- # ifndef YYMALLOC
- # define YYMALLOC malloc
--# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
- void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
- # endif
- # endif
- # ifndef YYFREE
- # define YYFREE free
--# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
- void free (void *); /* INFRINGES ON USER NAME SPACE */
- # endif
-@@ -2248,23 +2246,7 @@
- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
--/* Copy COUNT objects from FROM to TO. The source and destination do
-- not overlap. */
--# ifndef YYCOPY
--# if defined __GNUC__ && 1 < __GNUC__
--# define YYCOPY(To, From, Count) \
-- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
--# else
--# define YYCOPY(To, From, Count) \
-- do \
-- { \
-- YYSIZE_T yyi; \
-- for (yyi = 0; yyi < (Count); yyi++) \
-- (To)[yyi] = (From)[yyi]; \
-- } \
-- while (YYID (0))
--# endif
--# endif
-+# define YYCOPY_NEEDED 1
-
- /* Relocate STACK from its old location to the new one. The
- local variables YYSIZE and YYSTACKSIZE give the old and new number of
-@@ -2284,6 +2266,26 @@
-
- #endif
-
-+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-+/* Copy COUNT objects from FROM to TO. The source and destination do
-+ not overlap. */
-+# ifndef YYCOPY
-+# if defined __GNUC__ && 1 < __GNUC__
-+# define YYCOPY(To, From, Count) \
-+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-+# else
-+# define YYCOPY(To, From, Count) \
-+ do \
-+ { \
-+ YYSIZE_T yyi; \
-+ for (yyi = 0; yyi < (Count); yyi++) \
-+ (To)[yyi] = (From)[yyi]; \
-+ } \
-+ while (YYID (0))
-+# endif
-+# endif
-+#endif /* !YYCOPY_NEEDED */
-+
- /* YYFINAL -- State number of the termination state. */
- #define YYFINAL 573
- /* YYLAST -- Last index in YYTABLE. */
-@@ -4564,8 +4566,8 @@
- 5, 3
- };
-
--/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
-+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-+ Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
- static const yytype_uint16 yydefact[] =
- {
-@@ -5616,8 +5618,7 @@
-
- /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
-- number is the opposite. If zero, do what YYDEFACT says.
-- If YYTABLE_NINF, syntax error. */
-+ number is the opposite. If YYTABLE_NINF, syntax error. */
- #define YYTABLE_NINF -2436
- static const yytype_int16 yytable[] =
- {
-@@ -10609,6 +10610,12 @@
- 0, 458, 0, 0, 460, 0, 462, 0, 0, 463
- };
-
-+#define yypact_value_is_default(yystate) \
-+ ((yystate) == (-3602))
-+
-+#define yytable_value_is_error(yytable_value) \
-+ YYID (0)
-+
- static const yytype_int16 yycheck[] =
- {
- 6, 612, 549, 549, 621, 622, 933, 571, 934, 20,
-@@ -16041,9 +16048,18 @@
-
- /* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
-- Once GCC version 2 has supplanted version 1, this can go. */
-+ Once GCC version 2 has supplanted version 1, this can go. However,
-+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
-+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-+ discussed. */
-
- #define YYFAIL goto yyerrlab
-+#if defined YYFAIL
-+ /* This is here to suppress warnings from the GCC cpp's
-+ -Wunused-macros. Normally we don't worry about that warning, but
-+ some users do, and we want to make it easy for users to remove
-+ YYFAIL uses, which will produce warnings from Bison 2.5. */
-+#endif
-
- #define YYRECOVERING() (!!yyerrstatus)
-
-@@ -16053,7 +16069,6 @@
- { \
- yychar = (Token); \
- yylval = (Value); \
-- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
-@@ -16095,19 +16110,10 @@
- #endif
-
-
--/* YY_LOCATION_PRINT -- Print the location on the stream.
-- This macro was not mandated originally: define only if we know
-- we won't break user code: when these are the locations we know. */
-+/* This macro is provided for backward compatibility. */
-
- #ifndef YY_LOCATION_PRINT
--# if YYLTYPE_IS_TRIVIAL
--# define YY_LOCATION_PRINT(File, Loc) \
-- fprintf (File, "%d.%d-%d.%d", \
-- (Loc).first_line, (Loc).first_column, \
-- (Loc).last_line, (Loc).last_column)
--# else
--# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
--# endif
-+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
- #endif
-
-
-@@ -16299,7 +16305,6 @@
- # define YYMAXDEPTH 10000
- #endif
-
--
-
- #if YYERROR_VERBOSE
-
-@@ -16402,115 +16407,142 @@
- }
- # endif
-
--/* Copy into YYRESULT an error message about the unexpected token
-- YYCHAR while in state YYSTATE. Return the number of bytes copied,
-- including the terminating null byte. If YYRESULT is null, do not
-- copy anything; just return the number of bytes that would be
-- copied. As a special case, return 0 if an ordinary "syntax error"
-- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
-- size calculation. */
--static YYSIZE_T
--yysyntax_error (char *yyresult, int yystate, int yychar)
-+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-+ about the unexpected token YYTOKEN for the state stack whose top is
-+ YYSSP.
-+
-+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
-+ not large enough to hold the message. In that case, also set
-+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
-+ required number of bytes is too large to store. */
-+static int
-+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-+ yytype_int16 *yyssp, int yytoken)
- {
-- int yyn = yypact[yystate];
--
-- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-- return 0;
-- else
-+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-+ YYSIZE_T yysize = yysize0;
-+ YYSIZE_T yysize1;
-+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-+ /* Internationalized format string. */
-+ const char *yyformat = 0;
-+ /* Arguments of yyformat. */
-+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-+ /* Number of reported tokens (one for the "unexpected", one per
-+ "expected"). */
-+ int yycount = 0;
-+
-+ /* There are many possibilities here to consider:
-+ - Assume YYFAIL is not used. It's too flawed to consider. See
-+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-+ for details. YYERROR is fine as it does not invoke this
-+ function.
-+ - If this state is a consistent state with a default action, then
-+ the only way this function was invoked is if the default action
-+ is an error action. In that case, don't check for expected
-+ tokens because there are none.
-+ - The only way there can be no lookahead present (in yychar) is if
-+ this state is a consistent state with a default action. Thus,
-+ detecting the absence of a lookahead is sufficient to determine
-+ that there is no unexpected or expected token to report. In that
-+ case, just report a simple "syntax error".
-+ - Don't assume there isn't a lookahead just because this state is a
-+ consistent state with a default action. There might have been a
-+ previous inconsistent state, consistent state with a non-default
-+ action, or user semantic action that manipulated yychar.
-+ - Of course, the expected token list depends on states to have
-+ correct lookahead information, and it depends on the parser not
-+ to perform extra reductions after fetching a lookahead from the
-+ scanner and before detecting a syntax error. Thus, state merging
-+ (from LALR or IELR) and default reductions corrupt the expected
-+ token list. However, the list is correct for canonical LR with
-+ one exception: it will still contain any token that will not be
-+ accepted due to an error action in a later state.
-+ */
-+ if (yytoken != YYEMPTY)
- {
-- int yytype = YYTRANSLATE (yychar);
-- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-- YYSIZE_T yysize = yysize0;
-- YYSIZE_T yysize1;
-- int yysize_overflow = 0;
-- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-- int yyx;
--
--# if 0
-- /* This is so xgettext sees the translatable formats that are
-- constructed on the fly. */
-- YY_("syntax error, unexpected %s");
-- YY_("syntax error, unexpected %s, expecting %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
--# endif
-- char *yyfmt;
-- char const *yyf;
-- static char const yyunexpected[] = "syntax error, unexpected %s";
-- static char const yyexpecting[] = ", expecting %s";
-- static char const yyor[] = " or %s";
-- char yyformat[sizeof yyunexpected
-- + sizeof yyexpecting - 1
-- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-- * (sizeof yyor - 1))];
-- char const *yyprefix = yyexpecting;
--
-- /* Start YYX at -YYN if negative to avoid negative indexes in
-- YYCHECK. */
-- int yyxbegin = yyn < 0 ? -yyn : 0;
--
-- /* Stay within bounds of both yycheck and yytname. */
-- int yychecklim = YYLAST - yyn + 1;
-- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-- int yycount = 1;
--
-- yyarg[0] = yytname[yytype];
-- yyfmt = yystpcpy (yyformat, yyunexpected);
--
-- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-- {
-- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-- {
-- yycount = 1;
-- yysize = yysize0;
-- yyformat[sizeof yyunexpected - 1] = '\0';
-- break;
-- }
-- yyarg[yycount++] = yytname[yyx];
-- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-- yysize_overflow |= (yysize1 < yysize);
-- yysize = yysize1;
-- yyfmt = yystpcpy (yyfmt, yyprefix);
-- yyprefix = yyor;
-- }
--
-- yyf = YY_(yyformat);
-- yysize1 = yysize + yystrlen (yyf);
-- yysize_overflow |= (yysize1 < yysize);
-- yysize = yysize1;
-+ int yyn = yypact[*yyssp];
-+ yyarg[yycount++] = yytname[yytoken];
-+ if (!yypact_value_is_default (yyn))
-+ {
-+ /* Start YYX at -YYN if negative to avoid negative indexes in
-+ YYCHECK. In other words, skip the first -YYN actions for
-+ this state because they are default actions. */
-+ int yyxbegin = yyn < 0 ? -yyn : 0;
-+ /* Stay within bounds of both yycheck and yytname. */
-+ int yychecklim = YYLAST - yyn + 1;
-+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-+ int yyx;
-+
-+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-+ && !yytable_value_is_error (yytable[yyx + yyn]))
-+ {
-+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-+ {
-+ yycount = 1;
-+ yysize = yysize0;
-+ break;
-+ }
-+ yyarg[yycount++] = yytname[yyx];
-+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-+ if (! (yysize <= yysize1
-+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+ return 2;
-+ yysize = yysize1;
-+ }
-+ }
-+ }
-
-- if (yysize_overflow)
-- return YYSIZE_MAXIMUM;
-+ switch (yycount)
-+ {
-+# define YYCASE_(N, S) \
-+ case N: \
-+ yyformat = S; \
-+ break
-+ YYCASE_(0, YY_("syntax error"));
-+ YYCASE_(1, YY_("syntax error, unexpected %s"));
-+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-+# undef YYCASE_
-+ }
-
-- if (yyresult)
-- {
-- /* Avoid sprintf, as that infringes on the user's name space.
-- Don't have undefined behavior even if the translation
-- produced a string with the wrong number of "%s"s. */
-- char *yyp = yyresult;
-- int yyi = 0;
-- while ((*yyp = *yyf) != '\0')
-- {
-- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-- {
-- yyp += yytnamerr (yyp, yyarg[yyi++]);
-- yyf += 2;
-- }
-- else
-- {
-- yyp++;
-- yyf++;
-- }
-- }
-- }
-- return yysize;
-+ yysize1 = yysize + yystrlen (yyformat);
-+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+ return 2;
-+ yysize = yysize1;
-+
-+ if (*yymsg_alloc < yysize)
-+ {
-+ *yymsg_alloc = 2 * yysize;
-+ if (! (yysize <= *yymsg_alloc
-+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-+ return 1;
- }
-+
-+ /* Avoid sprintf, as that infringes on the user's name space.
-+ Don't have undefined behavior even if the translation
-+ produced a string with the wrong number of "%s"s. */
-+ {
-+ char *yyp = *yymsg;
-+ int yyi = 0;
-+ while ((*yyp = *yyformat) != '\0')
-+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-+ {
-+ yyp += yytnamerr (yyp, yyarg[yyi++]);
-+ yyformat += 2;
-+ }
-+ else
-+ {
-+ yyp++;
-+ yyformat++;
-+ }
-+ }
-+ return 0;
- }
- #endif /* YYERROR_VERBOSE */
--
-
- /*-----------------------------------------------.
- | Release the memory associated to this symbol. |
-@@ -16543,6 +16575,7 @@
- }
- }
-
-+
- /* Prevent warnings from -Wmissing-prototypes. */
- #ifdef YYPARSE_PARAM
- #if defined __STDC__ || defined __cplusplus
-@@ -16559,12 +16592,9 @@
- #endif /* ! YYPARSE_PARAM */
-
-
--
--
--
--/*-------------------------.
--| yyparse or yypush_parse. |
--`-------------------------*/
-+/*----------.
-+| yyparse. |
-+`----------*/
-
- #ifdef YYPARSE_PARAM
- #if (defined __STDC__ || defined __C99__FUNC__ \
-@@ -16751,7 +16781,7 @@
-
- /* First try to decide what to do without reference to lookahead token. */
- yyn = yypact[yystate];
-- if (yyn == YYPACT_NINF)
-+ if (yypact_value_is_default (yyn))
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-@@ -16782,8 +16812,8 @@
- yyn = yytable[yyn];
- if (yyn <= 0)
- {
-- if (yyn == 0 || yyn == YYTABLE_NINF)
-- goto yyerrlab;
-+ if (yytable_value_is_error (yyn))
-+ goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
-@@ -16838,8 +16868,8 @@
- {
- case 2:
-
--/* Line 1455 of yacc.c */
--#line 1657 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1657 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- if (!thd->bootstrap &&
-@@ -16855,8 +16885,8 @@
-
- case 3:
-
--/* Line 1455 of yacc.c */
--#line 1669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1669 "sql/sql_yacc.yy"
- {
- Lex_input_stream *lip = YYLIP;
-
-@@ -16883,8 +16913,8 @@
-
- case 5:
-
--/* Line 1455 of yacc.c */
--#line 1694 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1694 "sql/sql_yacc.yy"
- {
- /* Single query, not terminated. */
- YYLIP->found_semicolon= NULL;
-@@ -16893,8 +16923,8 @@
-
- case 61:
-
--/* Line 1455 of yacc.c */
--#line 1767 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1767 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -16905,8 +16935,8 @@
-
- case 64:
-
--/* Line 1455 of yacc.c */
--#line 1782 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1782 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -16917,8 +16947,8 @@
-
- case 65:
-
--/* Line 1455 of yacc.c */
--#line 1792 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1792 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -16929,8 +16959,8 @@
-
- case 66:
-
--/* Line 1455 of yacc.c */
--#line 1799 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1799 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -16941,8 +16971,8 @@
-
- case 67:
-
--/* Line 1455 of yacc.c */
--#line 1809 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1809 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -16953,15 +16983,15 @@
-
- case 68:
-
--/* Line 1455 of yacc.c */
--#line 1816 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1816 "sql/sql_yacc.yy"
- {}
- break;
-
- case 73:
-
--/* Line 1455 of yacc.c */
--#line 1831 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1831 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- LEX_STRING *lexstr= (LEX_STRING*)sql_memdup(&(yyvsp[(2) - (2)].lex_str), sizeof(LEX_STRING));
-@@ -16972,8 +17002,8 @@
-
- case 74:
-
--/* Line 1455 of yacc.c */
--#line 1843 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1843 "sql/sql_yacc.yy"
- {
- if (Lex->sphead)
- {
-@@ -16985,8 +17015,8 @@
-
- case 75:
-
--/* Line 1455 of yacc.c */
--#line 1851 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1851 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_HELP;
-@@ -16996,8 +17026,8 @@
-
- case 76:
-
--/* Line 1455 of yacc.c */
--#line 1862 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1862 "sql/sql_yacc.yy"
- {
- LEX *lex = Lex;
- lex->sql_command = SQLCOM_CHANGE_MASTER;
-@@ -17010,15 +17040,15 @@
-
- case 77:
-
--/* Line 1455 of yacc.c */
--#line 1871 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1871 "sql/sql_yacc.yy"
- {}
- break;
-
- case 80:
-
--/* Line 1455 of yacc.c */
--#line 1881 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1881 "sql/sql_yacc.yy"
- {
- Lex->mi.host = (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17026,8 +17056,8 @@
-
- case 81:
-
--/* Line 1455 of yacc.c */
--#line 1885 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1885 "sql/sql_yacc.yy"
- {
- Lex->mi.user = (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17035,8 +17065,8 @@
-
- case 82:
-
--/* Line 1455 of yacc.c */
--#line 1889 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1889 "sql/sql_yacc.yy"
- {
- Lex->mi.password = (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17044,8 +17074,8 @@
-
- case 83:
-
--/* Line 1455 of yacc.c */
--#line 1893 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1893 "sql/sql_yacc.yy"
- {
- Lex->mi.port = (yyvsp[(3) - (3)].ulong_num);
- }
-@@ -17053,8 +17083,8 @@
-
- case 84:
-
--/* Line 1455 of yacc.c */
--#line 1897 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1897 "sql/sql_yacc.yy"
- {
- Lex->mi.connect_retry = (yyvsp[(3) - (3)].ulong_num);
- }
-@@ -17062,8 +17092,8 @@
-
- case 85:
-
--/* Line 1455 of yacc.c */
--#line 1901 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1901 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl= (yyvsp[(3) - (3)].ulong_num) ?
- LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
-@@ -17072,8 +17102,8 @@
-
- case 86:
-
--/* Line 1455 of yacc.c */
--#line 1906 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1906 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl_ca= (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17081,8 +17111,8 @@
-
- case 87:
-
--/* Line 1455 of yacc.c */
--#line 1910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1910 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl_capath= (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17090,8 +17120,8 @@
-
- case 88:
-
--/* Line 1455 of yacc.c */
--#line 1914 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1914 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl_cert= (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17099,8 +17129,8 @@
-
- case 89:
-
--/* Line 1455 of yacc.c */
--#line 1918 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1918 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl_cipher= (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17108,8 +17138,8 @@
-
- case 90:
-
--/* Line 1455 of yacc.c */
--#line 1922 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1922 "sql/sql_yacc.yy"
- {
- Lex->mi.ssl_key= (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17117,8 +17147,8 @@
-
- case 91:
-
--/* Line 1455 of yacc.c */
--#line 1926 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1926 "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;
-@@ -17127,8 +17157,8 @@
-
- case 92:
-
--/* Line 1455 of yacc.c */
--#line 1932 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1932 "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 ||
-@@ -17163,8 +17193,8 @@
-
- case 93:
-
--/* Line 1455 of yacc.c */
--#line 1963 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1963 "sql/sql_yacc.yy"
- {
- Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
- }
-@@ -17172,8 +17202,8 @@
-
- case 98:
-
--/* Line 1455 of yacc.c */
--#line 1978 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1978 "sql/sql_yacc.yy"
- {
- if (Lex->mi.repl_ignore_server_ids.elements == 0)
- {
-@@ -17189,8 +17219,8 @@
-
- case 99:
-
--/* Line 1455 of yacc.c */
--#line 1992 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1992 "sql/sql_yacc.yy"
- {
- Lex->mi.log_file_name = (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17198,8 +17228,8 @@
-
- case 100:
-
--/* Line 1455 of yacc.c */
--#line 1996 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 1996 "sql/sql_yacc.yy"
- {
- Lex->mi.pos = (yyvsp[(3) - (3)].ulonglong_number);
- /*
-@@ -17219,8 +17249,8 @@
-
- case 101:
-
--/* Line 1455 of yacc.c */
--#line 2012 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2012 "sql/sql_yacc.yy"
- {
- Lex->mi.relay_log_name = (yyvsp[(3) - (3)].lex_str).str;
- }
-@@ -17228,8 +17258,8 @@
-
- case 102:
-
--/* Line 1455 of yacc.c */
--#line 2016 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2016 "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) */
-@@ -17239,8 +17269,8 @@
-
- case 103:
-
--/* Line 1455 of yacc.c */
--#line 2027 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2027 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -17269,8 +17299,8 @@
-
- case 104:
-
--/* Line 1455 of yacc.c */
--#line 2052 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2052 "sql/sql_yacc.yy"
- {
- LEX *lex= YYTHD->lex;
- lex->current_select= &lex->select_lex;
-@@ -17290,8 +17320,8 @@
-
- case 105:
-
--/* Line 1455 of yacc.c */
--#line 2068 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2068 "sql/sql_yacc.yy"
- {
- if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
- MYSQL_YYABORT;
-@@ -17300,8 +17330,8 @@
-
- case 106:
-
--/* Line 1455 of yacc.c */
--#line 2073 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2073 "sql/sql_yacc.yy"
- {
- if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
- MYSQL_YYABORT;
-@@ -17310,8 +17340,8 @@
-
- case 107:
-
--/* Line 1455 of yacc.c */
--#line 2079 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2079 "sql/sql_yacc.yy"
- {
- if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
- MYSQL_YYABORT;
-@@ -17320,8 +17350,8 @@
-
- case 108:
-
--/* Line 1455 of yacc.c */
--#line 2084 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2084 "sql/sql_yacc.yy"
- {
- if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
- MYSQL_YYABORT;
-@@ -17330,8 +17360,8 @@
-
- case 109:
-
--/* Line 1455 of yacc.c */
--#line 2090 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2090 "sql/sql_yacc.yy"
- {
- if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
- MYSQL_YYABORT;
-@@ -17340,8 +17370,8 @@
-
- case 110:
-
--/* Line 1455 of yacc.c */
--#line 2095 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2095 "sql/sql_yacc.yy"
- {
- if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
- MYSQL_YYABORT;
-@@ -17350,8 +17380,8 @@
-
- case 111:
-
--/* Line 1455 of yacc.c */
--#line 2100 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2100 "sql/sql_yacc.yy"
- {
- Lex->create_info.default_table_charset= NULL;
- Lex->create_info.used_fields= 0;
-@@ -17360,8 +17390,8 @@
-
- case 112:
-
--/* Line 1455 of yacc.c */
--#line 2105 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2105 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command=SQLCOM_CREATE_DB;
-@@ -17372,8 +17402,8 @@
-
- case 113:
-
--/* Line 1455 of yacc.c */
--#line 2112 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2112 "sql/sql_yacc.yy"
- {
- Lex->create_view_mode= VIEW_CREATE_NEW;
- Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED;
-@@ -17383,15 +17413,15 @@
-
- case 114:
-
--/* Line 1455 of yacc.c */
--#line 2118 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2118 "sql/sql_yacc.yy"
- {}
- break;
-
- case 115:
-
--/* Line 1455 of yacc.c */
--#line 2120 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2120 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_CREATE_USER;
- }
-@@ -17399,8 +17429,8 @@
-
- case 116:
-
--/* Line 1455 of yacc.c */
--#line 2124 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2124 "sql/sql_yacc.yy"
- {
- Lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP;
- }
-@@ -17408,8 +17438,8 @@
-
- case 117:
-
--/* Line 1455 of yacc.c */
--#line 2128 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2128 "sql/sql_yacc.yy"
- {
- Lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE;
- }
-@@ -17417,8 +17447,8 @@
-
- case 118:
-
--/* Line 1455 of yacc.c */
--#line 2132 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2132 "sql/sql_yacc.yy"
- {
- Lex->sql_command= SQLCOM_CREATE_SERVER;
- }
-@@ -17426,8 +17456,8 @@
-
- case 119:
-
--/* Line 1455 of yacc.c */
--#line 2143 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2143 "sql/sql_yacc.yy"
- {
- Lex->server_options.server_name= (yyvsp[(2) - (10)].lex_str).str;
- Lex->server_options.server_name_length= (yyvsp[(2) - (10)].lex_str).length;
-@@ -17437,8 +17467,8 @@
-
- case 122:
-
--/* Line 1455 of yacc.c */
--#line 2157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2157 "sql/sql_yacc.yy"
- {
- Lex->server_options.username= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17446,8 +17476,8 @@
-
- case 123:
-
--/* Line 1455 of yacc.c */
--#line 2161 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2161 "sql/sql_yacc.yy"
- {
- Lex->server_options.host= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17455,8 +17485,8 @@
-
- case 124:
-
--/* Line 1455 of yacc.c */
--#line 2165 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2165 "sql/sql_yacc.yy"
- {
- Lex->server_options.db= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17464,8 +17494,8 @@
-
- case 125:
-
--/* Line 1455 of yacc.c */
--#line 2169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2169 "sql/sql_yacc.yy"
- {
- Lex->server_options.owner= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17473,8 +17503,8 @@
-
- case 126:
-
--/* Line 1455 of yacc.c */
--#line 2173 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2173 "sql/sql_yacc.yy"
- {
- Lex->server_options.password= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17482,8 +17512,8 @@
-
- case 127:
-
--/* Line 1455 of yacc.c */
--#line 2177 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2177 "sql/sql_yacc.yy"
- {
- Lex->server_options.socket= (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -17491,8 +17521,8 @@
-
- case 128:
-
--/* Line 1455 of yacc.c */
--#line 2181 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2181 "sql/sql_yacc.yy"
- {
- Lex->server_options.port= (yyvsp[(2) - (2)].ulong_num);
- }
-@@ -17500,8 +17530,8 @@
-
- case 129:
-
--/* Line 1455 of yacc.c */
--#line 2188 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2188 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex=Lex;
-@@ -17521,8 +17551,8 @@
-
- case 130:
-
--/* Line 1455 of yacc.c */
--#line 2208 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2208 "sql/sql_yacc.yy"
- {
- /*
- sql_command is set here because some rules in ev_sql_stmt
-@@ -17534,8 +17564,8 @@
-
- case 131:
-
--/* Line 1455 of yacc.c */
--#line 2219 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2219 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->item_expression= (yyvsp[(2) - (3)].item);
- Lex->event_parse_data->interval= (yyvsp[(3) - (3)].interval);
-@@ -17544,8 +17574,8 @@
-
- case 133:
-
--/* Line 1455 of yacc.c */
--#line 2226 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2226 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->item_execute_at= (yyvsp[(2) - (2)].item);
- }
-@@ -17553,15 +17583,15 @@
-
- case 134:
-
--/* Line 1455 of yacc.c */
--#line 2232 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2232 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 135:
-
--/* Line 1455 of yacc.c */
--#line 2234 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2234 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->status= Event_parse_data::ENABLED;
- Lex->event_parse_data->status_changed= true;
-@@ -17571,8 +17601,8 @@
-
- case 136:
-
--/* Line 1455 of yacc.c */
--#line 2240 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2240 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->status= Event_parse_data::SLAVESIDE_DISABLED;
- Lex->event_parse_data->status_changed= true;
-@@ -17582,8 +17612,8 @@
-
- case 137:
-
--/* Line 1455 of yacc.c */
--#line 2246 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2246 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->status= Event_parse_data::DISABLED;
- Lex->event_parse_data->status_changed= true;
-@@ -17593,8 +17623,8 @@
-
- case 138:
-
--/* Line 1455 of yacc.c */
--#line 2255 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2255 "sql/sql_yacc.yy"
- {
- Item *item= new (YYTHD->mem_root) Item_func_now_local();
- if (item == NULL)
-@@ -17605,8 +17635,8 @@
-
- case 139:
-
--/* Line 1455 of yacc.c */
--#line 2262 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2262 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->item_starts= (yyvsp[(2) - (2)].item);
- }
-@@ -17614,8 +17644,8 @@
-
- case 141:
-
--/* Line 1455 of yacc.c */
--#line 2270 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2270 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->item_ends= (yyvsp[(2) - (2)].item);
- }
-@@ -17623,15 +17653,15 @@
-
- case 142:
-
--/* Line 1455 of yacc.c */
--#line 2276 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2276 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 144:
-
--/* Line 1455 of yacc.c */
--#line 2282 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2282 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->on_completion=
- Event_parse_data::ON_COMPLETION_PRESERVE;
-@@ -17641,8 +17671,8 @@
-
- case 145:
-
--/* Line 1455 of yacc.c */
--#line 2288 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2288 "sql/sql_yacc.yy"
- {
- Lex->event_parse_data->on_completion=
- Event_parse_data::ON_COMPLETION_DROP;
-@@ -17652,15 +17682,15 @@
-
- case 146:
-
--/* Line 1455 of yacc.c */
--#line 2296 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2296 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 147:
-
--/* Line 1455 of yacc.c */
--#line 2298 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2298 "sql/sql_yacc.yy"
- {
- Lex->comment= Lex->event_parse_data->comment= (yyvsp[(2) - (2)].lex_str);
- (yyval.num)= 1;
-@@ -17669,8 +17699,8 @@
-
- case 148:
-
--/* Line 1455 of yacc.c */
--#line 2305 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2305 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -17717,8 +17747,8 @@
-
- case 149:
-
--/* Line 1455 of yacc.c */
--#line 2348 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2348 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -17735,8 +17765,8 @@
-
- case 163:
-
--/* Line 1455 of yacc.c */
--#line 2380 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2380 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->users_list.empty();
-@@ -17752,8 +17782,8 @@
-
- case 164:
-
--/* Line 1455 of yacc.c */
--#line 2395 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2395 "sql/sql_yacc.yy"
- {
- if (!(yyvsp[(1) - (3)].lex_str).str || check_db_name(&(yyvsp[(1) - (3)].lex_str)))
- {
-@@ -17773,8 +17803,8 @@
-
- case 165:
-
--/* Line 1455 of yacc.c */
--#line 2411 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2411 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -17794,106 +17824,106 @@
-
- case 166:
-
--/* Line 1455 of yacc.c */
--#line 2429 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2429 "sql/sql_yacc.yy"
- {}
- break;
-
- case 167:
-
--/* Line 1455 of yacc.c */
--#line 2430 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2430 "sql/sql_yacc.yy"
- {}
- break;
-
- case 168:
-
--/* Line 1455 of yacc.c */
--#line 2434 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2434 "sql/sql_yacc.yy"
- {}
- break;
-
- case 169:
-
--/* Line 1455 of yacc.c */
--#line 2435 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2435 "sql/sql_yacc.yy"
- {}
- break;
-
- case 170:
-
--/* Line 1455 of yacc.c */
--#line 2441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2441 "sql/sql_yacc.yy"
- { Lex->sp_chistics.comment= (yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 171:
-
--/* Line 1455 of yacc.c */
--#line 2443 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2443 "sql/sql_yacc.yy"
- { /* Just parse it, we only have one language for now. */ }
- break;
-
- case 172:
-
--/* Line 1455 of yacc.c */
--#line 2445 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2445 "sql/sql_yacc.yy"
- { Lex->sp_chistics.daccess= SP_NO_SQL; }
- break;
-
- case 173:
-
--/* Line 1455 of yacc.c */
--#line 2447 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2447 "sql/sql_yacc.yy"
- { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; }
- break;
-
- case 174:
-
--/* Line 1455 of yacc.c */
--#line 2449 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2449 "sql/sql_yacc.yy"
- { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; }
- break;
-
- case 175:
-
--/* Line 1455 of yacc.c */
--#line 2451 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2451 "sql/sql_yacc.yy"
- { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; }
- break;
-
- case 176:
-
--/* Line 1455 of yacc.c */
--#line 2453 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2453 "sql/sql_yacc.yy"
- {}
- break;
-
- case 177:
-
--/* Line 1455 of yacc.c */
--#line 2458 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2458 "sql/sql_yacc.yy"
- { }
- break;
-
- case 178:
-
--/* Line 1455 of yacc.c */
--#line 2459 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2459 "sql/sql_yacc.yy"
- { Lex->sp_chistics.detistic= TRUE; }
- break;
-
- case 179:
-
--/* Line 1455 of yacc.c */
--#line 2460 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2460 "sql/sql_yacc.yy"
- { Lex->sp_chistics.detistic= FALSE; }
- break;
-
- case 180:
-
--/* Line 1455 of yacc.c */
--#line 2465 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2465 "sql/sql_yacc.yy"
- {
- Lex->sp_chistics.suid= SP_IS_SUID;
- }
-@@ -17901,8 +17931,8 @@
-
- case 181:
-
--/* Line 1455 of yacc.c */
--#line 2469 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2469 "sql/sql_yacc.yy"
- {
- Lex->sp_chistics.suid= SP_IS_NOT_SUID;
- }
-@@ -17910,8 +17940,8 @@
-
- case 182:
-
--/* Line 1455 of yacc.c */
--#line 2476 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2476 "sql/sql_yacc.yy"
- {
- LEX *lex = Lex;
-
-@@ -17924,15 +17954,15 @@
-
- case 183:
-
--/* Line 1455 of yacc.c */
--#line 2484 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2484 "sql/sql_yacc.yy"
- {}
- break;
-
- case 188:
-
--/* Line 1455 of yacc.c */
--#line 2500 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2500 "sql/sql_yacc.yy"
- {
- Lex->value_list.push_back((yyvsp[(3) - (3)].item));
- }
-@@ -17940,8 +17970,8 @@
-
- case 189:
-
--/* Line 1455 of yacc.c */
--#line 2504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2504 "sql/sql_yacc.yy"
- {
- Lex->value_list.push_back((yyvsp[(1) - (1)].item));
- }
-@@ -17949,8 +17979,8 @@
-
- case 194:
-
--/* Line 1455 of yacc.c */
--#line 2522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2522 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -17971,8 +18001,8 @@
-
- case 195:
-
--/* Line 1455 of yacc.c */
--#line 2542 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2542 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *spc= lex->spcont;
-@@ -17999,8 +18029,8 @@
-
- case 200:
-
--/* Line 1455 of yacc.c */
--#line 2579 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2579 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *spc= lex->spcont;
-@@ -18027,50 +18057,50 @@
-
- case 201:
-
--/* Line 1455 of yacc.c */
--#line 2604 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2604 "sql/sql_yacc.yy"
- { (yyval.num)= sp_param_in; }
- break;
-
- case 202:
-
--/* Line 1455 of yacc.c */
--#line 2605 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2605 "sql/sql_yacc.yy"
- { (yyval.num)= sp_param_in; }
- break;
-
- case 203:
-
--/* Line 1455 of yacc.c */
--#line 2606 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2606 "sql/sql_yacc.yy"
- { (yyval.num)= sp_param_out; }
- break;
-
- case 204:
-
--/* Line 1455 of yacc.c */
--#line 2607 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2607 "sql/sql_yacc.yy"
- { (yyval.num)= sp_param_inout; }
- break;
-
- case 205:
-
--/* Line 1455 of yacc.c */
--#line 2611 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2611 "sql/sql_yacc.yy"
- {}
- break;
-
- case 207:
-
--/* Line 1455 of yacc.c */
--#line 2616 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2616 "sql/sql_yacc.yy"
- {}
- break;
-
- case 209:
-
--/* Line 1455 of yacc.c */
--#line 2622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2622 "sql/sql_yacc.yy"
- {
- (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
- }
-@@ -18078,8 +18108,8 @@
-
- case 210:
-
--/* Line 1455 of yacc.c */
--#line 2626 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2626 "sql/sql_yacc.yy"
- {
- /* We check for declarations out of (standard) order this way
- because letting the grammar rules reflect it caused tricky
-@@ -18106,8 +18136,8 @@
-
- case 211:
-
--/* Line 1455 of yacc.c */
--#line 2652 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2652 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -18118,8 +18148,8 @@
-
- case 212:
-
--/* Line 1455 of yacc.c */
--#line 2660 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2660 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= Lex;
-@@ -18180,8 +18210,8 @@
-
- case 213:
-
--/* Line 1455 of yacc.c */
--#line 2717 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2717 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *spc= lex->spcont;
-@@ -18200,8 +18230,8 @@
-
- case 214:
-
--/* Line 1455 of yacc.c */
--#line 2732 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2732 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -18227,8 +18257,8 @@
-
- case 215:
-
--/* Line 1455 of yacc.c */
--#line 2754 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2754 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -18264,8 +18294,8 @@
-
- case 216:
-
--/* Line 1455 of yacc.c */
--#line 2786 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2786 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -18292,8 +18322,8 @@
-
- case 217:
-
--/* Line 1455 of yacc.c */
--#line 2811 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2811 "sql/sql_yacc.yy"
- {
- Lex->sphead->reset_lex(YYTHD);
- }
-@@ -18301,8 +18331,8 @@
-
- case 218:
-
--/* Line 1455 of yacc.c */
--#line 2815 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2815 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -18323,36 +18353,36 @@
-
- case 219:
-
--/* Line 1455 of yacc.c */
--#line 2834 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2834 "sql/sql_yacc.yy"
- { (yyval.num)= SP_HANDLER_EXIT; }
- break;
-
- case 220:
-
--/* Line 1455 of yacc.c */
--#line 2835 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2835 "sql/sql_yacc.yy"
- { (yyval.num)= SP_HANDLER_CONTINUE; }
- break;
-
- case 221:
-
--/* Line 1455 of yacc.c */
--#line 2841 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2841 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 222:
-
--/* Line 1455 of yacc.c */
--#line 2843 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2843 "sql/sql_yacc.yy"
- { (yyval.num)+= 1; }
- break;
-
- case 223:
-
--/* Line 1455 of yacc.c */
--#line 2848 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2848 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -18376,8 +18406,8 @@
-
- case 224:
-
--/* Line 1455 of yacc.c */
--#line 2871 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2871 "sql/sql_yacc.yy"
- { /* mysql errno */
- if ((yyvsp[(1) - (1)].ulong_num) == 0)
- {
-@@ -18394,8 +18424,8 @@
-
- case 226:
-
--/* Line 1455 of yacc.c */
--#line 2888 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2888 "sql/sql_yacc.yy"
- { /* SQLSTATE */
- if (!sp_cond_check(&(yyvsp[(3) - (3)].lex_str)))
- {
-@@ -18413,22 +18443,22 @@
-
- case 227:
-
--/* Line 1455 of yacc.c */
--#line 2904 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2904 "sql/sql_yacc.yy"
- {}
- break;
-
- case 228:
-
--/* Line 1455 of yacc.c */
--#line 2905 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2905 "sql/sql_yacc.yy"
- {}
- break;
-
- case 229:
-
--/* Line 1455 of yacc.c */
--#line 2910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2910 "sql/sql_yacc.yy"
- {
- (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype);
- }
-@@ -18436,8 +18466,8 @@
-
- case 230:
-
--/* Line 1455 of yacc.c */
--#line 2914 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2914 "sql/sql_yacc.yy"
- {
- (yyval.spcondtype)= Lex->spcont->find_cond(&(yyvsp[(1) - (1)].lex_str));
- if ((yyval.spcondtype) == NULL)
-@@ -18450,8 +18480,8 @@
-
- case 231:
-
--/* Line 1455 of yacc.c */
--#line 2923 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2923 "sql/sql_yacc.yy"
- {
- (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
- if ((yyval.spcondtype) == NULL)
-@@ -18462,8 +18492,8 @@
-
- case 232:
-
--/* Line 1455 of yacc.c */
--#line 2930 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2930 "sql/sql_yacc.yy"
- {
- (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
- if ((yyval.spcondtype) == NULL)
-@@ -18474,8 +18504,8 @@
-
- case 233:
-
--/* Line 1455 of yacc.c */
--#line 2937 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2937 "sql/sql_yacc.yy"
- {
- (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
- if ((yyval.spcondtype) == NULL)
-@@ -18486,8 +18516,8 @@
-
- case 234:
-
--/* Line 1455 of yacc.c */
--#line 2947 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2947 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -18503,8 +18533,8 @@
-
- case 235:
-
--/* Line 1455 of yacc.c */
--#line 2962 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2962 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_cond_type_t *cond;
-@@ -18531,29 +18561,29 @@
-
- case 236:
-
--/* Line 1455 of yacc.c */
--#line 2985 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2985 "sql/sql_yacc.yy"
- { (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype); }
- break;
-
- case 237:
-
--/* Line 1455 of yacc.c */
--#line 2990 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2990 "sql/sql_yacc.yy"
- { (yyval.spcondtype)= NULL; }
- break;
-
- case 238:
-
--/* Line 1455 of yacc.c */
--#line 2992 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2992 "sql/sql_yacc.yy"
- { (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype); }
- break;
-
- case 239:
-
--/* Line 1455 of yacc.c */
--#line 2997 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 2997 "sql/sql_yacc.yy"
- {
- YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear();
- }
-@@ -18561,8 +18591,8 @@
-
- case 241:
-
--/* Line 1455 of yacc.c */
--#line 3005 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3005 "sql/sql_yacc.yy"
- {
- Set_signal_information *info;
- info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
-@@ -18574,8 +18604,8 @@
-
- case 242:
-
--/* Line 1455 of yacc.c */
--#line 3014 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3014 "sql/sql_yacc.yy"
- {
- Set_signal_information *info;
- info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
-@@ -18592,15 +18622,15 @@
-
- case 243:
-
--/* Line 1455 of yacc.c */
--#line 3033 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3033 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item); }
- break;
-
- case 244:
-
--/* Line 1455 of yacc.c */
--#line 3035 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3035 "sql/sql_yacc.yy"
- {
- if ((yyvsp[(1) - (1)].item)->type() == Item::FUNC_ITEM)
- {
-@@ -18622,99 +18652,99 @@
-
- case 245:
-
--/* Line 1455 of yacc.c */
--#line 3053 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3053 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item); }
- break;
-
- case 246:
-
--/* Line 1455 of yacc.c */
--#line 3059 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3059 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CLASS_ORIGIN; }
- break;
-
- case 247:
-
--/* Line 1455 of yacc.c */
--#line 3061 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3061 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_SUBCLASS_ORIGIN; }
- break;
-
- case 248:
-
--/* Line 1455 of yacc.c */
--#line 3063 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3063 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_CATALOG; }
- break;
-
- case 249:
-
--/* Line 1455 of yacc.c */
--#line 3065 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3065 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_SCHEMA; }
- break;
-
- case 250:
-
--/* Line 1455 of yacc.c */
--#line 3067 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3067 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_NAME; }
- break;
-
- case 251:
-
--/* Line 1455 of yacc.c */
--#line 3069 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3069 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CATALOG_NAME; }
- break;
-
- case 252:
-
--/* Line 1455 of yacc.c */
--#line 3071 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3071 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_SCHEMA_NAME; }
- break;
-
- case 253:
-
--/* Line 1455 of yacc.c */
--#line 3073 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3073 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_TABLE_NAME; }
- break;
-
- case 254:
-
--/* Line 1455 of yacc.c */
--#line 3075 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3075 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_COLUMN_NAME; }
- break;
-
- case 255:
-
--/* Line 1455 of yacc.c */
--#line 3077 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3077 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_CURSOR_NAME; }
- break;
-
- case 256:
-
--/* Line 1455 of yacc.c */
--#line 3079 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3079 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_MESSAGE_TEXT; }
- break;
-
- case 257:
-
--/* Line 1455 of yacc.c */
--#line 3081 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3081 "sql/sql_yacc.yy"
- { (yyval.diag_condition_item_name)= DIAG_MYSQL_ERRNO; }
- break;
-
- case 258:
-
--/* Line 1455 of yacc.c */
--#line 3086 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3086 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -18730,8 +18760,8 @@
-
- case 259:
-
--/* Line 1455 of yacc.c */
--#line 3101 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3101 "sql/sql_yacc.yy"
- {
- /* NOTE: field definition is filled in sp_decl section. */
-
-@@ -18750,8 +18780,8 @@
-
- case 260:
-
--/* Line 1455 of yacc.c */
--#line 3116 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3116 "sql/sql_yacc.yy"
- {
- /* NOTE: field definition is filled in sp_decl section. */
-
-@@ -18770,36 +18800,36 @@
-
- case 261:
-
--/* Line 1455 of yacc.c */
--#line 3133 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3133 "sql/sql_yacc.yy"
- { (yyval.item) = NULL; }
- break;
-
- case 262:
-
--/* Line 1455 of yacc.c */
--#line 3134 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3134 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(2) - (2)].item); }
- break;
-
- case 276:
-
--/* Line 1455 of yacc.c */
--#line 3155 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3155 "sql/sql_yacc.yy"
- { Lex->sphead->new_cont_backpatch(NULL); }
- break;
-
- case 277:
-
--/* Line 1455 of yacc.c */
--#line 3157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3157 "sql/sql_yacc.yy"
- { Lex->sphead->do_cont_backpatch(); }
- break;
-
- case 278:
-
--/* Line 1455 of yacc.c */
--#line 3161 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3161 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -18812,8 +18842,8 @@
-
- case 279:
-
--/* Line 1455 of yacc.c */
--#line 3170 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3170 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -18862,15 +18892,15 @@
-
- case 280:
-
--/* Line 1455 of yacc.c */
--#line 3218 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3218 "sql/sql_yacc.yy"
- { Lex->sphead->reset_lex(YYTHD); }
- break;
-
- case 281:
-
--/* Line 1455 of yacc.c */
--#line 3220 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3220 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -18898,8 +18928,8 @@
-
- case 282:
-
--/* Line 1455 of yacc.c */
--#line 3246 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3246 "sql/sql_yacc.yy"
- { /* Unlabeled controls get a secret label. */
- LEX *lex= Lex;
-
-@@ -18909,8 +18939,8 @@
-
- case 283:
-
--/* Line 1455 of yacc.c */
--#line 3252 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3252 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -18920,8 +18950,8 @@
-
- case 284:
-
--/* Line 1455 of yacc.c */
--#line 3261 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3261 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp = lex->sphead;
-@@ -18975,8 +19005,8 @@
-
- case 285:
-
--/* Line 1455 of yacc.c */
--#line 3314 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3314 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19020,8 +19050,8 @@
-
- case 286:
-
--/* Line 1455 of yacc.c */
--#line 3357 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3357 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19042,8 +19072,8 @@
-
- case 287:
-
--/* Line 1455 of yacc.c */
--#line 3377 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3377 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19064,15 +19094,15 @@
-
- case 288:
-
--/* Line 1455 of yacc.c */
--#line 3394 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3394 "sql/sql_yacc.yy"
- {}
- break;
-
- case 289:
-
--/* Line 1455 of yacc.c */
--#line 3399 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3399 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19093,8 +19123,8 @@
-
- case 293:
-
--/* Line 1455 of yacc.c */
--#line 3425 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3425 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19118,8 +19148,8 @@
-
- case 294:
-
--/* Line 1455 of yacc.c */
--#line 3445 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3445 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19143,15 +19173,15 @@
-
- case 295:
-
--/* Line 1455 of yacc.c */
--#line 3467 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3467 "sql/sql_yacc.yy"
- { Lex->sphead->reset_lex(YYTHD); }
- break;
-
- case 296:
-
--/* Line 1455 of yacc.c */
--#line 3469 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3469 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19171,8 +19201,8 @@
-
- case 297:
-
--/* Line 1455 of yacc.c */
--#line 3485 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3485 "sql/sql_yacc.yy"
- {
- sp_head *sp= Lex->sphead;
- sp_pcontext *ctx= Lex->spcont;
-@@ -19188,8 +19218,8 @@
-
- case 298:
-
--/* Line 1455 of yacc.c */
--#line 3497 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3497 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -19199,8 +19229,8 @@
-
- case 304:
-
--/* Line 1455 of yacc.c */
--#line 3517 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3517 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- case_stmt_action_case(lex);
-@@ -19210,8 +19240,8 @@
-
- case 305:
-
--/* Line 1455 of yacc.c */
--#line 3523 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3523 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (case_stmt_action_expr(lex, (yyvsp[(3) - (3)].item)))
-@@ -19225,8 +19255,8 @@
-
- case 306:
-
--/* Line 1455 of yacc.c */
--#line 3536 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3536 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- case_stmt_action_end_case(lex, true);
-@@ -19235,8 +19265,8 @@
-
- case 307:
-
--/* Line 1455 of yacc.c */
--#line 3544 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3544 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- case_stmt_action_case(lex);
-@@ -19245,8 +19275,8 @@
-
- case 308:
-
--/* Line 1455 of yacc.c */
--#line 3552 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3552 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- case_stmt_action_end_case(lex, false);
-@@ -19255,8 +19285,8 @@
-
- case 313:
-
--/* Line 1455 of yacc.c */
--#line 3570 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3570 "sql/sql_yacc.yy"
- {
- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
- }
-@@ -19264,8 +19294,8 @@
-
- case 314:
-
--/* Line 1455 of yacc.c */
--#line 3574 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3574 "sql/sql_yacc.yy"
- {
- /* Simple case: <caseval> = <whenval> */
-
-@@ -19280,8 +19310,8 @@
-
- case 315:
-
--/* Line 1455 of yacc.c */
--#line 3586 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3586 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (case_stmt_action_then(lex))
-@@ -19291,8 +19321,8 @@
-
- case 316:
-
--/* Line 1455 of yacc.c */
--#line 3595 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3595 "sql/sql_yacc.yy"
- {
- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
- }
-@@ -19300,8 +19330,8 @@
-
- case 317:
-
--/* Line 1455 of yacc.c */
--#line 3599 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3599 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (case_stmt_action_when(lex, (yyvsp[(3) - (3)].item), false))
-@@ -19314,8 +19344,8 @@
-
- case 318:
-
--/* Line 1455 of yacc.c */
--#line 3609 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3609 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (case_stmt_action_then(lex))
-@@ -19325,8 +19355,8 @@
-
- case 319:
-
--/* Line 1455 of yacc.c */
--#line 3618 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3618 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19341,8 +19371,8 @@
-
- case 321:
-
--/* Line 1455 of yacc.c */
--#line 3633 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3633 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *ctx= lex->spcont;
-@@ -19364,8 +19394,8 @@
-
- case 322:
-
--/* Line 1455 of yacc.c */
--#line 3651 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3651 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_label_t *lab= lex->spcont->pop_label();
-@@ -19384,22 +19414,22 @@
-
- case 323:
-
--/* Line 1455 of yacc.c */
--#line 3668 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3668 "sql/sql_yacc.yy"
- { (yyval.lex_str)= null_lex_str; }
- break;
-
- case 324:
-
--/* Line 1455 of yacc.c */
--#line 3669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3669 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 325:
-
--/* Line 1455 of yacc.c */
--#line 3674 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3674 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *ctx= lex->spcont;
-@@ -19419,8 +19449,8 @@
-
- case 326:
-
--/* Line 1455 of yacc.c */
--#line 3690 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3690 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_label_t *lab= lex->spcont->pop_label();
-@@ -19438,8 +19468,8 @@
-
- case 327:
-
--/* Line 1455 of yacc.c */
--#line 3706 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3706 "sql/sql_yacc.yy"
- { /* Unlabeled blocks get a secret label. */
- LEX *lex= Lex;
- uint ip= lex->sphead->instructions();
-@@ -19450,8 +19480,8 @@
-
- case 328:
-
--/* Line 1455 of yacc.c */
--#line 3713 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3713 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->spcont->pop_label();
-@@ -19460,8 +19490,8 @@
-
- case 329:
-
--/* Line 1455 of yacc.c */
--#line 3721 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3721 "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. */
-@@ -19472,8 +19502,8 @@
-
- case 330:
-
--/* Line 1455 of yacc.c */
--#line 3730 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3730 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19501,8 +19531,8 @@
-
- case 331:
-
--/* Line 1455 of yacc.c */
--#line 3758 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3758 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- uint ip= lex->sphead->instructions();
-@@ -19516,15 +19546,15 @@
-
- case 332:
-
--/* Line 1455 of yacc.c */
--#line 3768 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3768 "sql/sql_yacc.yy"
- { Lex->sphead->reset_lex(YYTHD); }
- break;
-
- case 333:
-
--/* Line 1455 of yacc.c */
--#line 3770 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3770 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -19544,8 +19574,8 @@
-
- case 334:
-
--/* Line 1455 of yacc.c */
--#line 3786 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3786 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- uint ip= lex->sphead->instructions();
-@@ -19560,15 +19590,15 @@
-
- case 335:
-
--/* Line 1455 of yacc.c */
--#line 3797 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3797 "sql/sql_yacc.yy"
- { Lex->sphead->reset_lex(YYTHD); }
- break;
-
- case 336:
-
--/* Line 1455 of yacc.c */
--#line 3799 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3799 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- uint ip= lex->sphead->instructions();
-@@ -19588,50 +19618,50 @@
-
- case 337:
-
--/* Line 1455 of yacc.c */
--#line 3818 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3818 "sql/sql_yacc.yy"
- { Lex->trg_chistics.action_time= TRG_ACTION_BEFORE; }
- break;
-
- case 338:
-
--/* Line 1455 of yacc.c */
--#line 3820 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3820 "sql/sql_yacc.yy"
- { Lex->trg_chistics.action_time= TRG_ACTION_AFTER; }
- break;
-
- case 339:
-
--/* Line 1455 of yacc.c */
--#line 3825 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3825 "sql/sql_yacc.yy"
- { Lex->trg_chistics.event= TRG_EVENT_INSERT; }
- break;
-
- case 340:
-
--/* Line 1455 of yacc.c */
--#line 3827 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3827 "sql/sql_yacc.yy"
- { Lex->trg_chistics.event= TRG_EVENT_UPDATE; }
- break;
-
- case 341:
-
--/* Line 1455 of yacc.c */
--#line 3829 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3829 "sql/sql_yacc.yy"
- { Lex->trg_chistics.event= TRG_EVENT_DELETE; }
- break;
-
- case 345:
-
--/* Line 1455 of yacc.c */
--#line 3863 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3863 "sql/sql_yacc.yy"
- {}
- break;
-
- case 346:
-
--/* Line 1455 of yacc.c */
--#line 3865 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3865 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->logfile_group_name= (yyvsp[(4) - (4)].lex_str).str;
-@@ -19640,8 +19670,8 @@
-
- case 347:
-
--/* Line 1455 of yacc.c */
--#line 3875 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3875 "sql/sql_yacc.yy"
- {
- Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_ADD_FILE;
- }
-@@ -19649,8 +19679,8 @@
-
- case 348:
-
--/* Line 1455 of yacc.c */
--#line 3881 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3881 "sql/sql_yacc.yy"
- {
- Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_DROP_FILE;
- }
-@@ -19658,15 +19688,15 @@
-
- case 353:
-
--/* Line 1455 of yacc.c */
--#line 3904 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3904 "sql/sql_yacc.yy"
- {}
- break;
-
- case 400:
-
--/* Line 1455 of yacc.c */
--#line 3998 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 3998 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->data_file_name= (yyvsp[(2) - (2)].lex_str).str;
-@@ -19675,8 +19705,8 @@
-
- case 401:
-
--/* Line 1455 of yacc.c */
--#line 4006 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4006 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->undo_file_name= (yyvsp[(2) - (2)].lex_str).str;
-@@ -19685,8 +19715,8 @@
-
- case 402:
-
--/* Line 1455 of yacc.c */
--#line 4014 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4014 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->redo_file_name= (yyvsp[(2) - (2)].lex_str).str;
-@@ -19695,8 +19725,8 @@
-
- case 403:
-
--/* Line 1455 of yacc.c */
--#line 4022 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4022 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info= new st_alter_tablespace();
-@@ -19709,8 +19739,8 @@
-
- case 404:
-
--/* Line 1455 of yacc.c */
--#line 4034 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4034 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info= new st_alter_tablespace();
-@@ -19723,8 +19753,8 @@
-
- case 405:
-
--/* Line 1455 of yacc.c */
--#line 4046 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4046 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_access_mode= TS_READ_ONLY;
-@@ -19733,8 +19763,8 @@
-
- case 406:
-
--/* Line 1455 of yacc.c */
--#line 4051 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4051 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_access_mode= TS_READ_WRITE;
-@@ -19743,8 +19773,8 @@
-
- case 407:
-
--/* Line 1455 of yacc.c */
--#line 4056 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4056 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_access_mode= TS_NOT_ACCESSIBLE;
-@@ -19753,8 +19783,8 @@
-
- case 408:
-
--/* Line 1455 of yacc.c */
--#line 4064 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4064 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->initial_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19763,8 +19793,8 @@
-
- case 409:
-
--/* Line 1455 of yacc.c */
--#line 4072 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4072 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->autoextend_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19773,8 +19803,8 @@
-
- case 410:
-
--/* Line 1455 of yacc.c */
--#line 4080 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4080 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->max_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19783,8 +19813,8 @@
-
- case 411:
-
--/* Line 1455 of yacc.c */
--#line 4088 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4088 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->extent_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19793,8 +19823,8 @@
-
- case 412:
-
--/* Line 1455 of yacc.c */
--#line 4096 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4096 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->undo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19803,8 +19833,8 @@
-
- case 413:
-
--/* Line 1455 of yacc.c */
--#line 4104 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4104 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->redo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
-@@ -19813,8 +19843,8 @@
-
- case 414:
-
--/* Line 1455 of yacc.c */
--#line 4112 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4112 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->alter_tablespace_info->nodegroup_id != UNDEF_NODEGROUP)
-@@ -19828,8 +19858,8 @@
-
- case 415:
-
--/* Line 1455 of yacc.c */
--#line 4125 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4125 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->alter_tablespace_info->ts_comment != NULL)
-@@ -19843,8 +19873,8 @@
-
- case 416:
-
--/* Line 1455 of yacc.c */
--#line 4138 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4138 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->alter_tablespace_info->storage_engine != NULL)
-@@ -19859,8 +19889,8 @@
-
- case 419:
-
--/* Line 1455 of yacc.c */
--#line 4157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4157 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->wait_until_completed= TRUE;
-@@ -19869,8 +19899,8 @@
-
- case 420:
-
--/* Line 1455 of yacc.c */
--#line 4162 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4162 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (!(lex->alter_tablespace_info->wait_until_completed))
-@@ -19884,15 +19914,15 @@
-
- case 421:
-
--/* Line 1455 of yacc.c */
--#line 4174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4174 "sql/sql_yacc.yy"
- { (yyval.ulonglong_number)= (yyvsp[(1) - (1)].ulong_num);}
- break;
-
- case 422:
-
--/* Line 1455 of yacc.c */
--#line 4176 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4176 "sql/sql_yacc.yy"
- {
- ulonglong number;
- uint text_shift_number= 0;
-@@ -19940,22 +19970,22 @@
-
- case 423:
-
--/* Line 1455 of yacc.c */
--#line 4226 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4226 "sql/sql_yacc.yy"
- {}
- break;
-
- case 424:
-
--/* Line 1455 of yacc.c */
--#line 4229 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4229 "sql/sql_yacc.yy"
- {}
- break;
-
- case 425:
-
--/* Line 1455 of yacc.c */
--#line 4231 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4231 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- TABLE_LIST *src_table;
-@@ -19974,8 +20004,8 @@
-
- case 426:
-
--/* Line 1455 of yacc.c */
--#line 4246 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4246 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- TABLE_LIST *src_table;
-@@ -19994,64 +20024,64 @@
-
- case 427:
-
--/* Line 1455 of yacc.c */
--#line 4265 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4265 "sql/sql_yacc.yy"
- {}
- break;
-
- case 428:
-
--/* Line 1455 of yacc.c */
--#line 4268 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4268 "sql/sql_yacc.yy"
- { Select->set_braces(1);}
- break;
-
- case 429:
-
--/* Line 1455 of yacc.c */
--#line 4269 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4269 "sql/sql_yacc.yy"
- {}
- break;
-
- case 430:
-
--/* Line 1455 of yacc.c */
--#line 4273 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4273 "sql/sql_yacc.yy"
- {}
- break;
-
- case 431:
-
--/* Line 1455 of yacc.c */
--#line 4275 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4275 "sql/sql_yacc.yy"
- { Select->set_braces(0);}
- break;
-
- case 432:
-
--/* Line 1455 of yacc.c */
--#line 4276 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4276 "sql/sql_yacc.yy"
- {}
- break;
-
- case 433:
-
--/* Line 1455 of yacc.c */
--#line 4278 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4278 "sql/sql_yacc.yy"
- { Select->set_braces(1);}
- break;
-
- case 434:
-
--/* Line 1455 of yacc.c */
--#line 4279 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4279 "sql/sql_yacc.yy"
- {}
- break;
-
- case 435:
-
--/* Line 1455 of yacc.c */
--#line 4284 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4284 "sql/sql_yacc.yy"
- {
- /*
- Remove all tables used in PARTITION clause from the global table
-@@ -20065,15 +20095,15 @@
-
- case 436:
-
--/* Line 1455 of yacc.c */
--#line 4320 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4320 "sql/sql_yacc.yy"
- {}
- break;
-
- case 438:
-
--/* Line 1455 of yacc.c */
--#line 4326 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4326 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->part_info= new partition_info();
-@@ -20091,8 +20121,8 @@
-
- case 440:
-
--/* Line 1455 of yacc.c */
--#line 4344 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4344 "sql/sql_yacc.yy"
- {
- #ifdef WITH_PARTITION_STORAGE_ENGINE
- LEX_STRING partition_name={C_STRING_WITH_LEN("partition")};
-@@ -20112,8 +20142,8 @@
-
- case 441:
-
--/* Line 1455 of yacc.c */
--#line 4363 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4363 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (!lex->part_info)
-@@ -20130,15 +20160,15 @@
-
- case 442:
-
--/* Line 1455 of yacc.c */
--#line 4375 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4375 "sql/sql_yacc.yy"
- {}
- break;
-
- case 444:
-
--/* Line 1455 of yacc.c */
--#line 4384 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4384 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->list_of_part_fields= TRUE;
-@@ -20149,92 +20179,92 @@
-
- case 445:
-
--/* Line 1455 of yacc.c */
--#line 4391 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4391 "sql/sql_yacc.yy"
- { Lex->part_info->part_type= HASH_PARTITION; }
- break;
-
- case 446:
-
--/* Line 1455 of yacc.c */
--#line 4392 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4392 "sql/sql_yacc.yy"
- {}
- break;
-
- case 447:
-
--/* Line 1455 of yacc.c */
--#line 4394 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4394 "sql/sql_yacc.yy"
- { Lex->part_info->part_type= RANGE_PARTITION; }
- break;
-
- case 448:
-
--/* Line 1455 of yacc.c */
--#line 4396 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4396 "sql/sql_yacc.yy"
- { Lex->part_info->part_type= RANGE_PARTITION; }
- break;
-
- case 449:
-
--/* Line 1455 of yacc.c */
--#line 4398 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4398 "sql/sql_yacc.yy"
- { Lex->part_info->part_type= LIST_PARTITION; }
- break;
-
- case 450:
-
--/* Line 1455 of yacc.c */
--#line 4400 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4400 "sql/sql_yacc.yy"
- { Lex->part_info->part_type= LIST_PARTITION; }
- break;
-
- case 451:
-
--/* Line 1455 of yacc.c */
--#line 4404 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4404 "sql/sql_yacc.yy"
- {}
- break;
-
- case 452:
-
--/* Line 1455 of yacc.c */
--#line 4406 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4406 "sql/sql_yacc.yy"
- { Lex->part_info->linear_hash_ind= TRUE;}
- break;
-
- case 453:
-
--/* Line 1455 of yacc.c */
--#line 4410 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4410 "sql/sql_yacc.yy"
- {}
- break;
-
- case 454:
-
--/* Line 1455 of yacc.c */
--#line 4411 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4411 "sql/sql_yacc.yy"
- {}
- break;
-
- case 455:
-
--/* Line 1455 of yacc.c */
--#line 4415 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4415 "sql/sql_yacc.yy"
- {}
- break;
-
- case 456:
-
--/* Line 1455 of yacc.c */
--#line 4416 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4416 "sql/sql_yacc.yy"
- {}
- break;
-
- case 457:
-
--/* Line 1455 of yacc.c */
--#line 4421 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4421 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->num_columns++;
-@@ -20254,8 +20284,8 @@
-
- case 458:
-
--/* Line 1455 of yacc.c */
--#line 4440 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4440 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->column_list= TRUE;
-@@ -20265,8 +20295,8 @@
-
- case 459:
-
--/* Line 1455 of yacc.c */
--#line 4450 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4450 "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))
-@@ -20278,8 +20308,8 @@
-
- case 460:
-
--/* Line 1455 of yacc.c */
--#line 4461 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4461 "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; }
-@@ -20288,15 +20318,15 @@
-
- case 461:
-
--/* Line 1455 of yacc.c */
--#line 4469 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4469 "sql/sql_yacc.yy"
- {}
- break;
-
- case 462:
-
--/* Line 1455 of yacc.c */
--#line 4471 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4471 "sql/sql_yacc.yy"
- {
- uint num_parts= (yyvsp[(2) - (2)].ulong_num);
- partition_info *part_info= Lex->part_info;
-@@ -20313,29 +20343,29 @@
-
- case 463:
-
--/* Line 1455 of yacc.c */
--#line 4486 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4486 "sql/sql_yacc.yy"
- {}
- break;
-
- case 464:
-
--/* Line 1455 of yacc.c */
--#line 4488 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4488 "sql/sql_yacc.yy"
- { Lex->part_info->subpart_type= HASH_PARTITION; }
- break;
-
- case 465:
-
--/* Line 1455 of yacc.c */
--#line 4489 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4489 "sql/sql_yacc.yy"
- {}
- break;
-
- case 466:
-
--/* Line 1455 of yacc.c */
--#line 4492 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4492 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->subpart_type= HASH_PARTITION;
-@@ -20345,29 +20375,29 @@
-
- case 467:
-
--/* Line 1455 of yacc.c */
--#line 4497 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4497 "sql/sql_yacc.yy"
- {}
- break;
-
- case 468:
-
--/* Line 1455 of yacc.c */
--#line 4501 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4501 "sql/sql_yacc.yy"
- {}
- break;
-
- case 469:
-
--/* Line 1455 of yacc.c */
--#line 4502 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4502 "sql/sql_yacc.yy"
- {}
- break;
-
- case 470:
-
--/* Line 1455 of yacc.c */
--#line 4507 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4507 "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))
-@@ -20386,8 +20416,8 @@
-
- case 471:
-
--/* Line 1455 of yacc.c */
--#line 4525 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4525 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- bool not_corr_func;
-@@ -20404,15 +20434,15 @@
-
- case 472:
-
--/* Line 1455 of yacc.c */
--#line 4540 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4540 "sql/sql_yacc.yy"
- {}
- break;
-
- case 473:
-
--/* Line 1455 of yacc.c */
--#line 4542 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4542 "sql/sql_yacc.yy"
- {
- uint num_parts= (yyvsp[(2) - (2)].ulong_num);
- LEX *lex= Lex;
-@@ -20428,8 +20458,8 @@
-
- case 474:
-
--/* Line 1455 of yacc.c */
--#line 4557 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4557 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- if (part_info->part_type == RANGE_PARTITION)
-@@ -20449,8 +20479,8 @@
-
- case 475:
-
--/* Line 1455 of yacc.c */
--#line 4573 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4573 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- uint count_curr_parts= part_info->partitions.elements;
-@@ -20473,22 +20503,22 @@
-
- case 476:
-
--/* Line 1455 of yacc.c */
--#line 4594 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4594 "sql/sql_yacc.yy"
- {}
- break;
-
- case 477:
-
--/* Line 1455 of yacc.c */
--#line 4595 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4595 "sql/sql_yacc.yy"
- {}
- break;
-
- case 478:
-
--/* Line 1455 of yacc.c */
--#line 4600 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4600 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- partition_element *p_elem= new partition_element();
-@@ -20508,15 +20538,15 @@
-
- case 479:
-
--/* Line 1455 of yacc.c */
--#line 4619 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4619 "sql/sql_yacc.yy"
- {}
- break;
-
- case 480:
-
--/* Line 1455 of yacc.c */
--#line 4624 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4624 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- partition_element *p_elem= part_info->curr_part_elem;
-@@ -20526,8 +20556,8 @@
-
- case 481:
-
--/* Line 1455 of yacc.c */
--#line 4633 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4633 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- partition_info *part_info= lex->part_info;
-@@ -20553,8 +20583,8 @@
-
- case 482:
-
--/* Line 1455 of yacc.c */
--#line 4655 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4655 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- partition_info *part_info= lex->part_info;
-@@ -20574,15 +20604,15 @@
-
- case 483:
-
--/* Line 1455 of yacc.c */
--#line 4670 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4670 "sql/sql_yacc.yy"
- {}
- break;
-
- case 484:
-
--/* Line 1455 of yacc.c */
--#line 4672 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4672 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- partition_info *part_info= lex->part_info;
-@@ -20602,15 +20632,15 @@
-
- case 485:
-
--/* Line 1455 of yacc.c */
--#line 4687 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4687 "sql/sql_yacc.yy"
- {}
- break;
-
- case 486:
-
--/* Line 1455 of yacc.c */
--#line 4692 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4692 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
-
-@@ -20636,15 +20666,15 @@
-
- case 487:
-
--/* Line 1455 of yacc.c */
--#line 4713 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4713 "sql/sql_yacc.yy"
- {}
- break;
-
- case 488:
-
--/* Line 1455 of yacc.c */
--#line 4718 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4718 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- partition_info *part_info= lex->part_info;
-@@ -20677,8 +20707,8 @@
-
- case 489:
-
--/* Line 1455 of yacc.c */
--#line 4747 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4747 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- if (part_info->num_columns < 2U)
-@@ -20691,22 +20721,22 @@
-
- case 490:
-
--/* Line 1455 of yacc.c */
--#line 4758 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4758 "sql/sql_yacc.yy"
- {}
- break;
-
- case 491:
-
--/* Line 1455 of yacc.c */
--#line 4759 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4759 "sql/sql_yacc.yy"
- {}
- break;
-
- case 492:
-
--/* Line 1455 of yacc.c */
--#line 4764 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4764 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->print_debug("( part_value_item", NULL);
-@@ -20722,15 +20752,15 @@
-
- case 493:
-
--/* Line 1455 of yacc.c */
--#line 4775 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4775 "sql/sql_yacc.yy"
- {}
- break;
-
- case 494:
-
--/* Line 1455 of yacc.c */
--#line 4777 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4777 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->print_debug(") part_value_item", NULL);
-@@ -20755,22 +20785,22 @@
-
- case 495:
-
--/* Line 1455 of yacc.c */
--#line 4800 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4800 "sql/sql_yacc.yy"
- {}
- break;
-
- case 496:
-
--/* Line 1455 of yacc.c */
--#line 4801 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4801 "sql/sql_yacc.yy"
- {}
- break;
-
- case 497:
-
--/* Line 1455 of yacc.c */
--#line 4806 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4806 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- if (part_info->part_type == LIST_PARTITION)
-@@ -20787,8 +20817,8 @@
-
- case 498:
-
--/* Line 1455 of yacc.c */
--#line 4819 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4819 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- partition_info *part_info= lex->part_info;
-@@ -20808,8 +20838,8 @@
-
- case 499:
-
--/* Line 1455 of yacc.c */
--#line 4839 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4839 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- if (part_info->num_subparts != 0 &&
-@@ -20827,8 +20857,8 @@
-
- case 500:
-
--/* Line 1455 of yacc.c */
--#line 4853 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4853 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- if (part_info->num_subparts != 0)
-@@ -20855,22 +20885,22 @@
-
- case 501:
-
--/* Line 1455 of yacc.c */
--#line 4878 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4878 "sql/sql_yacc.yy"
- {}
- break;
-
- case 502:
-
--/* Line 1455 of yacc.c */
--#line 4879 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4879 "sql/sql_yacc.yy"
- {}
- break;
-
- case 503:
-
--/* Line 1455 of yacc.c */
--#line 4884 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4884 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- partition_element *curr_part= part_info->current_partition;
-@@ -20907,57 +20937,57 @@
-
- case 504:
-
--/* Line 1455 of yacc.c */
--#line 4916 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4916 "sql/sql_yacc.yy"
- {}
- break;
-
- case 505:
-
--/* Line 1455 of yacc.c */
--#line 4921 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4921 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->partition_name= (yyvsp[(1) - (1)].lex_str).str; }
- break;
-
- case 506:
-
--/* Line 1455 of yacc.c */
--#line 4925 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4925 "sql/sql_yacc.yy"
- {}
- break;
-
- case 507:
-
--/* Line 1455 of yacc.c */
--#line 4926 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4926 "sql/sql_yacc.yy"
- {}
- break;
-
- case 508:
-
--/* Line 1455 of yacc.c */
--#line 4930 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4930 "sql/sql_yacc.yy"
- {}
- break;
-
- case 509:
-
--/* Line 1455 of yacc.c */
--#line 4931 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4931 "sql/sql_yacc.yy"
- {}
- break;
-
- case 510:
-
--/* Line 1455 of yacc.c */
--#line 4936 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4936 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->tablespace_name= (yyvsp[(3) - (3)].lex_str).str; }
- break;
-
- case 511:
-
--/* Line 1455 of yacc.c */
--#line 4938 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4938 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->curr_part_elem->engine_type= (yyvsp[(4) - (4)].db_type);
-@@ -20967,50 +20997,50 @@
-
- case 512:
-
--/* Line 1455 of yacc.c */
--#line 4944 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4944 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->nodegroup_id= (uint16) (yyvsp[(3) - (3)].ulong_num); }
- break;
-
- case 513:
-
--/* Line 1455 of yacc.c */
--#line 4946 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4946 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->part_max_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
- break;
-
- case 514:
-
--/* Line 1455 of yacc.c */
--#line 4948 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4948 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->part_min_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
- break;
-
- case 515:
-
--/* Line 1455 of yacc.c */
--#line 4950 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4950 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->data_file_name= (yyvsp[(4) - (4)].lex_str).str; }
- break;
-
- case 516:
-
--/* Line 1455 of yacc.c */
--#line 4952 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4952 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->index_file_name= (yyvsp[(4) - (4)].lex_str).str; }
- break;
-
- case 517:
-
--/* Line 1455 of yacc.c */
--#line 4954 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4954 "sql/sql_yacc.yy"
- { Lex->part_info->curr_part_elem->part_comment= (yyvsp[(3) - (3)].lex_str).str; }
- break;
-
- case 518:
-
--/* Line 1455 of yacc.c */
--#line 4963 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4963 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->sql_command == SQLCOM_INSERT)
-@@ -21029,8 +21059,8 @@
-
- case 519:
-
--/* Line 1455 of yacc.c */
--#line 4978 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4978 "sql/sql_yacc.yy"
- {
- Select->parsing_place= NO_MATTER;
- }
-@@ -21038,8 +21068,8 @@
-
- case 520:
-
--/* Line 1455 of yacc.c */
--#line 4982 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4982 "sql/sql_yacc.yy"
- {
- /*
- The following work only with the local list, the global list
-@@ -21051,113 +21081,113 @@
-
- case 521:
-
--/* Line 1455 of yacc.c */
--#line 4992 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4992 "sql/sql_yacc.yy"
- {}
- break;
-
- case 522:
-
--/* Line 1455 of yacc.c */
--#line 4993 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4993 "sql/sql_yacc.yy"
- {}
- break;
-
- case 523:
-
--/* Line 1455 of yacc.c */
--#line 4997 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4997 "sql/sql_yacc.yy"
- {}
- break;
-
- case 524:
-
--/* Line 1455 of yacc.c */
--#line 4998 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 4998 "sql/sql_yacc.yy"
- {}
- break;
-
- case 525:
-
--/* Line 1455 of yacc.c */
--#line 5002 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5002 "sql/sql_yacc.yy"
- {}
- break;
-
- case 526:
-
--/* Line 1455 of yacc.c */
--#line 5003 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5003 "sql/sql_yacc.yy"
- {}
- break;
-
- case 527:
-
--/* Line 1455 of yacc.c */
--#line 5007 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5007 "sql/sql_yacc.yy"
- {}
- break;
-
- case 528:
-
--/* Line 1455 of yacc.c */
--#line 5008 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5008 "sql/sql_yacc.yy"
- {}
- break;
-
- case 529:
-
--/* Line 1455 of yacc.c */
--#line 5012 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5012 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 530:
-
--/* Line 1455 of yacc.c */
--#line 5013 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5013 "sql/sql_yacc.yy"
- { (yyval.num)= (yyvsp[(1) - (1)].num);}
- break;
-
- case 531:
-
--/* Line 1455 of yacc.c */
--#line 5017 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5017 "sql/sql_yacc.yy"
- { (yyval.num)=(yyvsp[(1) - (1)].num); }
- break;
-
- case 532:
-
--/* Line 1455 of yacc.c */
--#line 5018 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5018 "sql/sql_yacc.yy"
- { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
- break;
-
- case 533:
-
--/* Line 1455 of yacc.c */
--#line 5022 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5022 "sql/sql_yacc.yy"
- { (yyval.num)=HA_LEX_CREATE_TMP_TABLE; }
- break;
-
- case 534:
-
--/* Line 1455 of yacc.c */
--#line 5026 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5026 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 535:
-
--/* Line 1455 of yacc.c */
--#line 5027 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5027 "sql/sql_yacc.yy"
- { (yyval.num)=HA_LEX_CREATE_IF_NOT_EXISTS; }
- break;
-
- case 543:
-
--/* Line 1455 of yacc.c */
--#line 5048 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5048 "sql/sql_yacc.yy"
- {
- Lex->create_info.db_type= (yyvsp[(3) - (3)].db_type);
- Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
-@@ -21166,8 +21196,8 @@
-
- case 544:
-
--/* Line 1455 of yacc.c */
--#line 5053 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5053 "sql/sql_yacc.yy"
- {
- Lex->create_info.max_rows= (yyvsp[(3) - (3)].ulonglong_number);
- Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;
-@@ -21176,8 +21206,8 @@
-
- case 545:
-
--/* Line 1455 of yacc.c */
--#line 5058 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5058 "sql/sql_yacc.yy"
- {
- Lex->create_info.min_rows= (yyvsp[(3) - (3)].ulonglong_number);
- Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;
-@@ -21186,8 +21216,8 @@
-
- case 546:
-
--/* Line 1455 of yacc.c */
--#line 5063 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5063 "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;
-@@ -21196,8 +21226,8 @@
-
- case 547:
-
--/* Line 1455 of yacc.c */
--#line 5068 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5068 "sql/sql_yacc.yy"
- {
- Lex->create_info.password=(yyvsp[(3) - (3)].lex_str).str;
- Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD;
-@@ -21206,8 +21236,8 @@
-
- case 548:
-
--/* Line 1455 of yacc.c */
--#line 5073 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5073 "sql/sql_yacc.yy"
- {
- Lex->create_info.comment=(yyvsp[(3) - (3)].lex_str);
- Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
-@@ -21216,8 +21246,8 @@
-
- case 549:
-
--/* Line 1455 of yacc.c */
--#line 5078 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5078 "sql/sql_yacc.yy"
- {
- Lex->create_info.auto_increment_value=(yyvsp[(3) - (3)].ulonglong_number);
- Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;
-@@ -21226,8 +21256,8 @@
-
- case 550:
-
--/* Line 1455 of yacc.c */
--#line 5083 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5083 "sql/sql_yacc.yy"
- {
- switch((yyvsp[(3) - (3)].ulong_num)) {
- case 0:
-@@ -21246,8 +21276,8 @@
-
- case 551:
-
--/* Line 1455 of yacc.c */
--#line 5098 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5098 "sql/sql_yacc.yy"
- {
- Lex->create_info.table_options&=
- ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS);
-@@ -21257,8 +21287,8 @@
-
- case 552:
-
--/* Line 1455 of yacc.c */
--#line 5104 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5104 "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;
-@@ -21267,8 +21297,8 @@
-
- case 553:
-
--/* Line 1455 of yacc.c */
--#line 5109 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5109 "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;
-@@ -21277,8 +21307,8 @@
-
- case 554:
-
--/* Line 1455 of yacc.c */
--#line 5114 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5114 "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;
-@@ -21287,8 +21317,8 @@
-
- case 555:
-
--/* Line 1455 of yacc.c */
--#line 5119 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5119 "sql/sql_yacc.yy"
- {
- Lex->create_info.row_type= (yyvsp[(3) - (3)].row_type);
- Lex->create_info.used_fields|= HA_CREATE_USED_ROW_FORMAT;
-@@ -21297,8 +21327,8 @@
-
- case 556:
-
--/* Line 1455 of yacc.c */
--#line 5124 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5124 "sql/sql_yacc.yy"
- {
- Lex->select_lex.table_list.save_and_clear(&Lex->save_list);
- }
-@@ -21306,8 +21336,8 @@
-
- case 557:
-
--/* Line 1455 of yacc.c */
--#line 5128 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5128 "sql/sql_yacc.yy"
- {
- /*
- Move the union list to the merge_list and exclude its tables
-@@ -21333,8 +21363,8 @@
-
- case 560:
-
--/* Line 1455 of yacc.c */
--#line 5152 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5152 "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;
-@@ -21343,8 +21373,8 @@
-
- case 561:
-
--/* Line 1455 of yacc.c */
--#line 5157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5157 "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;
-@@ -21353,8 +21383,8 @@
-
- case 562:
-
--/* Line 1455 of yacc.c */
--#line 5162 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5162 "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;
-@@ -21363,29 +21393,29 @@
-
- case 563:
-
--/* Line 1455 of yacc.c */
--#line 5167 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5167 "sql/sql_yacc.yy"
- {Lex->create_info.tablespace= (yyvsp[(2) - (2)].lex_str).str;}
- break;
-
- case 564:
-
--/* Line 1455 of yacc.c */
--#line 5169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5169 "sql/sql_yacc.yy"
- {Lex->create_info.storage_media= HA_SM_DISK;}
- break;
-
- case 565:
-
--/* Line 1455 of yacc.c */
--#line 5171 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5171 "sql/sql_yacc.yy"
- {Lex->create_info.storage_media= HA_SM_MEMORY;}
- break;
-
- case 566:
-
--/* Line 1455 of yacc.c */
--#line 5173 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5173 "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;
-@@ -21395,8 +21425,8 @@
-
- case 567:
-
--/* Line 1455 of yacc.c */
--#line 5179 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5179 "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);
-@@ -21405,8 +21435,8 @@
-
- case 568:
-
--/* Line 1455 of yacc.c */
--#line 5187 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5187 "sql/sql_yacc.yy"
- {
- HA_CREATE_INFO *cinfo= &Lex->create_info;
- if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
-@@ -21425,8 +21455,8 @@
-
- case 569:
-
--/* Line 1455 of yacc.c */
--#line 5205 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5205 "sql/sql_yacc.yy"
- {
- HA_CREATE_INFO *cinfo= &Lex->create_info;
- if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
-@@ -21444,8 +21474,8 @@
-
- case 570:
-
--/* Line 1455 of yacc.c */
--#line 5222 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5222 "sql/sql_yacc.yy"
- {
- plugin_ref plugin= ha_resolve_by_name(YYTHD, &(yyvsp[(1) - (1)].lex_str));
-
-@@ -21469,8 +21499,8 @@
-
- case 571:
-
--/* Line 1455 of yacc.c */
--#line 5245 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5245 "sql/sql_yacc.yy"
- {
- plugin_ref plugin;
- if ((plugin= ha_resolve_by_name(YYTHD, &(yyvsp[(1) - (1)].lex_str))))
-@@ -21485,106 +21515,106 @@
-
- case 572:
-
--/* Line 1455 of yacc.c */
--#line 5258 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5258 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_DEFAULT; }
- break;
-
- case 573:
-
--/* Line 1455 of yacc.c */
--#line 5259 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5259 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_FIXED; }
- break;
-
- case 574:
-
--/* Line 1455 of yacc.c */
--#line 5260 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5260 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_DYNAMIC; }
- break;
-
- case 575:
-
--/* Line 1455 of yacc.c */
--#line 5261 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5261 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_COMPRESSED; }
- break;
-
- case 576:
-
--/* Line 1455 of yacc.c */
--#line 5262 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5262 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_REDUNDANT; }
- break;
-
- case 577:
-
--/* Line 1455 of yacc.c */
--#line 5263 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5263 "sql/sql_yacc.yy"
- { (yyval.row_type)= ROW_TYPE_COMPACT; }
- break;
-
- case 578:
-
--/* Line 1455 of yacc.c */
--#line 5267 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5267 "sql/sql_yacc.yy"
- { (yyval.ulong_num)= MERGE_INSERT_DISABLED; }
- break;
-
- case 579:
-
--/* Line 1455 of yacc.c */
--#line 5268 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5268 "sql/sql_yacc.yy"
- { (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; }
- break;
-
- case 580:
-
--/* Line 1455 of yacc.c */
--#line 5269 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5269 "sql/sql_yacc.yy"
- { (yyval.ulong_num)= MERGE_INSERT_TO_LAST; }
- break;
-
- case 581:
-
--/* Line 1455 of yacc.c */
--#line 5273 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5273 "sql/sql_yacc.yy"
- {}
- break;
-
- case 583:
-
--/* Line 1455 of yacc.c */
--#line 5278 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5278 "sql/sql_yacc.yy"
- {(yyval.num) = (int) STRING_RESULT; }
- break;
-
- case 584:
-
--/* Line 1455 of yacc.c */
--#line 5279 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5279 "sql/sql_yacc.yy"
- {(yyval.num) = (int) REAL_RESULT; }
- break;
-
- case 585:
-
--/* Line 1455 of yacc.c */
--#line 5280 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5280 "sql/sql_yacc.yy"
- {(yyval.num) = (int) DECIMAL_RESULT; }
- break;
-
- case 586:
-
--/* Line 1455 of yacc.c */
--#line 5281 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5281 "sql/sql_yacc.yy"
- {(yyval.num) = (int) INT_RESULT; }
- break;
-
- case 587:
-
--/* Line 1455 of yacc.c */
--#line 5287 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5287 "sql/sql_yacc.yy"
- {
- Lex->create_last_non_select_table= Lex->last_table();
- }
-@@ -21592,8 +21622,8 @@
-
- case 593:
-
--/* Line 1455 of yacc.c */
--#line 5305 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5305 "sql/sql_yacc.yy"
- {
- Lex->col_list.empty(); /* Alloced by sql_alloc */
- }
-@@ -21601,8 +21631,8 @@
-
- case 594:
-
--/* Line 1455 of yacc.c */
--#line 5312 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5312 "sql/sql_yacc.yy"
- {
- if (add_create_index (Lex, (yyvsp[(1) - (7)].key_type), (yyvsp[(2) - (7)].lex_str)))
- MYSQL_YYABORT;
-@@ -21611,8 +21641,8 @@
-
- case 595:
-
--/* Line 1455 of yacc.c */
--#line 5318 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5318 "sql/sql_yacc.yy"
- {
- if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
- MYSQL_YYABORT;
-@@ -21621,8 +21651,8 @@
-
- case 596:
-
--/* Line 1455 of yacc.c */
--#line 5324 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5324 "sql/sql_yacc.yy"
- {
- if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
- MYSQL_YYABORT;
-@@ -21631,8 +21661,8 @@
-
- case 597:
-
--/* Line 1455 of yacc.c */
--#line 5330 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5330 "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;
-@@ -21641,8 +21671,8 @@
-
- case 598:
-
--/* Line 1455 of yacc.c */
--#line 5335 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5335 "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,
-@@ -21664,8 +21694,8 @@
-
- case 599:
-
--/* Line 1455 of yacc.c */
--#line 5353 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5353 "sql/sql_yacc.yy"
- {
- Lex->col_list.empty(); /* Alloced by sql_alloc */
- }
-@@ -21673,29 +21703,29 @@
-
- case 603:
-
--/* Line 1455 of yacc.c */
--#line 5368 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5368 "sql/sql_yacc.yy"
- { (yyval.lex_str)= null_lex_str; }
- break;
-
- case 604:
-
--/* Line 1455 of yacc.c */
--#line 5369 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5369 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 605:
-
--/* Line 1455 of yacc.c */
--#line 5373 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5373 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 606:
-
--/* Line 1455 of yacc.c */
--#line 5378 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5378 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->length=lex->dec=0;
-@@ -21708,8 +21738,8 @@
-
- case 607:
-
--/* Line 1455 of yacc.c */
--#line 5387 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5387 "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),
-@@ -21724,29 +21754,29 @@
-
- case 608:
-
--/* Line 1455 of yacc.c */
--#line 5400 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5400 "sql/sql_yacc.yy"
- { (yyval.num)=(yyvsp[(1) - (3)].num); }
- break;
-
- case 609:
-
--/* Line 1455 of yacc.c */
--#line 5401 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5401 "sql/sql_yacc.yy"
- { (yyval.num)=(yyvsp[(1) - (3)].num); }
- break;
-
- case 610:
-
--/* Line 1455 of yacc.c */
--#line 5402 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5402 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_FLOAT; }
- break;
-
- case 611:
-
--/* Line 1455 of yacc.c */
--#line 5404 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5404 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- (yyval.num)=MYSQL_TYPE_BIT;
-@@ -21755,8 +21785,8 @@
-
- case 612:
-
--/* Line 1455 of yacc.c */
--#line 5409 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5409 "sql/sql_yacc.yy"
- {
- (yyval.num)=MYSQL_TYPE_BIT;
- }
-@@ -21764,8 +21794,8 @@
-
- case 613:
-
--/* Line 1455 of yacc.c */
--#line 5413 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5413 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- (yyval.num)=MYSQL_TYPE_TINY;
-@@ -21774,8 +21804,8 @@
-
- case 614:
-
--/* Line 1455 of yacc.c */
--#line 5418 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5418 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- (yyval.num)=MYSQL_TYPE_TINY;
-@@ -21784,8 +21814,8 @@
-
- case 615:
-
--/* Line 1455 of yacc.c */
--#line 5423 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5423 "sql/sql_yacc.yy"
- {
- (yyval.num)=MYSQL_TYPE_STRING;
- }
-@@ -21793,8 +21823,8 @@
-
- case 616:
-
--/* Line 1455 of yacc.c */
--#line 5427 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5427 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- (yyval.num)=MYSQL_TYPE_STRING;
-@@ -21803,8 +21833,8 @@
-
- case 617:
-
--/* Line 1455 of yacc.c */
--#line 5432 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5432 "sql/sql_yacc.yy"
- {
- (yyval.num)=MYSQL_TYPE_STRING;
- Lex->charset=national_charset_info;
-@@ -21813,8 +21843,8 @@
-
- case 618:
-
--/* Line 1455 of yacc.c */
--#line 5437 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5437 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- (yyval.num)=MYSQL_TYPE_STRING;
-@@ -21824,8 +21854,8 @@
-
- case 619:
-
--/* Line 1455 of yacc.c */
--#line 5443 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5443 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_STRING;
-@@ -21834,8 +21864,8 @@
-
- case 620:
-
--/* Line 1455 of yacc.c */
--#line 5448 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5448 "sql/sql_yacc.yy"
- {
- Lex->length= (char*) "1";
- Lex->charset=&my_charset_bin;
-@@ -21845,8 +21875,8 @@
-
- case 621:
-
--/* Line 1455 of yacc.c */
--#line 5454 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5454 "sql/sql_yacc.yy"
- {
- (yyval.num)= MYSQL_TYPE_VARCHAR;
- }
-@@ -21854,8 +21884,8 @@
-
- case 622:
-
--/* Line 1455 of yacc.c */
--#line 5458 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5458 "sql/sql_yacc.yy"
- {
- (yyval.num)= MYSQL_TYPE_VARCHAR;
- Lex->charset=national_charset_info;
-@@ -21864,8 +21894,8 @@
-
- case 623:
-
--/* Line 1455 of yacc.c */
--#line 5463 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5463 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)= MYSQL_TYPE_VARCHAR;
-@@ -21874,8 +21904,8 @@
-
- case 624:
-
--/* Line 1455 of yacc.c */
--#line 5468 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5468 "sql/sql_yacc.yy"
- {
- if (Lex->length)
- {
-@@ -21897,22 +21927,22 @@
-
- case 625:
-
--/* Line 1455 of yacc.c */
--#line 5486 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5486 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_DATE; }
- break;
-
- case 626:
-
--/* Line 1455 of yacc.c */
--#line 5488 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5488 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_TIME; }
- break;
-
- case 627:
-
--/* Line 1455 of yacc.c */
--#line 5490 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5490 "sql/sql_yacc.yy"
- {
- if (YYTHD->variables.sql_mode & MODE_MAXDB)
- (yyval.num)=MYSQL_TYPE_DATETIME;
-@@ -21929,15 +21959,15 @@
-
- case 628:
-
--/* Line 1455 of yacc.c */
--#line 5503 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5503 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_DATETIME; }
- break;
-
- case 629:
-
--/* Line 1455 of yacc.c */
--#line 5505 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5505 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_TINY_BLOB;
-@@ -21946,8 +21976,8 @@
-
- case 630:
-
--/* Line 1455 of yacc.c */
--#line 5510 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5510 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_BLOB;
-@@ -21956,8 +21986,8 @@
-
- case 631:
-
--/* Line 1455 of yacc.c */
--#line 5515 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5515 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_SPATIAL
- Lex->charset=&my_charset_bin;
-@@ -21973,8 +22003,8 @@
-
- case 632:
-
--/* Line 1455 of yacc.c */
--#line 5527 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5527 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
-@@ -21983,8 +22013,8 @@
-
- case 633:
-
--/* Line 1455 of yacc.c */
--#line 5532 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5532 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_LONG_BLOB;
-@@ -21993,8 +22023,8 @@
-
- case 634:
-
--/* Line 1455 of yacc.c */
--#line 5537 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5537 "sql/sql_yacc.yy"
- {
- Lex->charset=&my_charset_bin;
- (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
-@@ -22003,99 +22033,99 @@
-
- case 635:
-
--/* Line 1455 of yacc.c */
--#line 5542 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5542 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
- break;
-
- case 636:
-
--/* Line 1455 of yacc.c */
--#line 5544 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5544 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_TINY_BLOB; }
- break;
-
- case 637:
-
--/* Line 1455 of yacc.c */
--#line 5546 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5546 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_BLOB; }
- break;
-
- case 638:
-
--/* Line 1455 of yacc.c */
--#line 5548 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5548 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
- break;
-
- case 639:
-
--/* Line 1455 of yacc.c */
--#line 5550 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5550 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_LONG_BLOB; }
- break;
-
- case 640:
-
--/* Line 1455 of yacc.c */
--#line 5552 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5552 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
- break;
-
- case 641:
-
--/* Line 1455 of yacc.c */
--#line 5554 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5554 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
- break;
-
- case 642:
-
--/* Line 1455 of yacc.c */
--#line 5556 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5556 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
- break;
-
- case 643:
-
--/* Line 1455 of yacc.c */
--#line 5558 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5558 "sql/sql_yacc.yy"
- {Lex->interval_list.empty();}
- break;
-
- case 644:
-
--/* Line 1455 of yacc.c */
--#line 5560 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5560 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_ENUM; }
- break;
-
- case 645:
-
--/* Line 1455 of yacc.c */
--#line 5562 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5562 "sql/sql_yacc.yy"
- { Lex->interval_list.empty();}
- break;
-
- case 646:
-
--/* Line 1455 of yacc.c */
--#line 5564 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5564 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_SET; }
- break;
-
- case 647:
-
--/* Line 1455 of yacc.c */
--#line 5566 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5566 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
- break;
-
- case 648:
-
--/* Line 1455 of yacc.c */
--#line 5568 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5568 "sql/sql_yacc.yy"
- {
- (yyval.num)=MYSQL_TYPE_LONGLONG;
- Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
-@@ -22105,22 +22135,22 @@
-
- case 649:
-
--/* Line 1455 of yacc.c */
--#line 5576 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5576 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_GEOMETRY; }
- break;
-
- case 650:
-
--/* Line 1455 of yacc.c */
--#line 5577 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5577 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_GEOMETRYCOLLECTION; }
- break;
-
- case 651:
-
--/* Line 1455 of yacc.c */
--#line 5579 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5579 "sql/sql_yacc.yy"
- {
- Lex->length= (char*)"25";
- (yyval.num)= Field::GEOM_POINT;
-@@ -22129,148 +22159,148 @@
-
- case 652:
-
--/* Line 1455 of yacc.c */
--#line 5583 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5583 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_MULTIPOINT; }
- break;
-
- case 653:
-
--/* Line 1455 of yacc.c */
--#line 5584 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5584 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_LINESTRING; }
- break;
-
- case 654:
-
--/* Line 1455 of yacc.c */
--#line 5585 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5585 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_MULTILINESTRING; }
- break;
-
- case 655:
-
--/* Line 1455 of yacc.c */
--#line 5586 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5586 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_POLYGON; }
- break;
-
- case 656:
-
--/* Line 1455 of yacc.c */
--#line 5587 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5587 "sql/sql_yacc.yy"
- { (yyval.num)= Field::GEOM_MULTIPOLYGON; }
- break;
-
- case 657:
-
--/* Line 1455 of yacc.c */
--#line 5591 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5591 "sql/sql_yacc.yy"
- {}
- break;
-
- case 658:
-
--/* Line 1455 of yacc.c */
--#line 5595 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5595 "sql/sql_yacc.yy"
- {}
- break;
-
- case 659:
-
--/* Line 1455 of yacc.c */
--#line 5596 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5596 "sql/sql_yacc.yy"
- {}
- break;
-
- case 660:
-
--/* Line 1455 of yacc.c */
--#line 5600 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5600 "sql/sql_yacc.yy"
- {}
- break;
-
- case 661:
-
--/* Line 1455 of yacc.c */
--#line 5601 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5601 "sql/sql_yacc.yy"
- {}
- break;
-
- case 662:
-
--/* Line 1455 of yacc.c */
--#line 5605 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5605 "sql/sql_yacc.yy"
- {}
- break;
-
- case 663:
-
--/* Line 1455 of yacc.c */
--#line 5606 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5606 "sql/sql_yacc.yy"
- {}
- break;
-
- case 664:
-
--/* Line 1455 of yacc.c */
--#line 5607 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5607 "sql/sql_yacc.yy"
- {}
- break;
-
- case 665:
-
--/* Line 1455 of yacc.c */
--#line 5608 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5608 "sql/sql_yacc.yy"
- {}
- break;
-
- case 666:
-
--/* Line 1455 of yacc.c */
--#line 5609 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5609 "sql/sql_yacc.yy"
- {}
- break;
-
- case 667:
-
--/* Line 1455 of yacc.c */
--#line 5613 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5613 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_LONG; }
- break;
-
- case 668:
-
--/* Line 1455 of yacc.c */
--#line 5614 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5614 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_TINY; }
- break;
-
- case 669:
-
--/* Line 1455 of yacc.c */
--#line 5615 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5615 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_SHORT; }
- break;
-
- case 670:
-
--/* Line 1455 of yacc.c */
--#line 5616 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5616 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_INT24; }
- break;
-
- case 671:
-
--/* Line 1455 of yacc.c */
--#line 5617 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5617 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_LONGLONG; }
- break;
-
- case 672:
-
--/* Line 1455 of yacc.c */
--#line 5622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5622 "sql/sql_yacc.yy"
- {
- (yyval.num)= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
- MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
-@@ -22279,43 +22309,43 @@
-
- case 673:
-
--/* Line 1455 of yacc.c */
--#line 5627 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5627 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_DOUBLE; }
- break;
-
- case 674:
-
--/* Line 1455 of yacc.c */
--#line 5629 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5629 "sql/sql_yacc.yy"
- { (yyval.num)=MYSQL_TYPE_DOUBLE; }
- break;
-
- case 675:
-
--/* Line 1455 of yacc.c */
--#line 5634 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5634 "sql/sql_yacc.yy"
- { Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 676:
-
--/* Line 1455 of yacc.c */
--#line 5636 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5636 "sql/sql_yacc.yy"
- { Lex->dec= (char*)0; }
- break;
-
- case 677:
-
--/* Line 1455 of yacc.c */
--#line 5638 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5638 "sql/sql_yacc.yy"
- {}
- break;
-
- case 678:
-
--/* Line 1455 of yacc.c */
--#line 5643 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5643 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->length=(yyvsp[(2) - (5)].lex_str).str;
-@@ -22325,155 +22355,155 @@
-
- case 679:
-
--/* Line 1455 of yacc.c */
--#line 5651 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5651 "sql/sql_yacc.yy"
- {}
- break;
-
- case 680:
-
--/* Line 1455 of yacc.c */
--#line 5652 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5652 "sql/sql_yacc.yy"
- {}
- break;
-
- case 681:
-
--/* Line 1455 of yacc.c */
--#line 5656 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5656 "sql/sql_yacc.yy"
- {}
- break;
-
- case 682:
-
--/* Line 1455 of yacc.c */
--#line 5657 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5657 "sql/sql_yacc.yy"
- {}
- break;
-
- case 683:
-
--/* Line 1455 of yacc.c */
--#line 5661 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5661 "sql/sql_yacc.yy"
- {}
- break;
-
- case 684:
-
--/* Line 1455 of yacc.c */
--#line 5662 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5662 "sql/sql_yacc.yy"
- { Lex->type|= UNSIGNED_FLAG;}
- break;
-
- case 685:
-
--/* Line 1455 of yacc.c */
--#line 5663 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5663 "sql/sql_yacc.yy"
- { Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; }
- break;
-
- case 686:
-
--/* Line 1455 of yacc.c */
--#line 5667 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5667 "sql/sql_yacc.yy"
- { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
- break;
-
- case 687:
-
--/* Line 1455 of yacc.c */
--#line 5668 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5668 "sql/sql_yacc.yy"
- { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
- break;
-
- case 688:
-
--/* Line 1455 of yacc.c */
--#line 5669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5669 "sql/sql_yacc.yy"
- { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
- break;
-
- case 689:
-
--/* Line 1455 of yacc.c */
--#line 5670 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5670 "sql/sql_yacc.yy"
- { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
- break;
-
- case 690:
-
--/* Line 1455 of yacc.c */
--#line 5673 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5673 "sql/sql_yacc.yy"
- { Lex->length=(char*) 0; /* use default length */ }
- break;
-
- case 691:
-
--/* Line 1455 of yacc.c */
--#line 5674 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5674 "sql/sql_yacc.yy"
- { }
- break;
-
- case 692:
-
--/* Line 1455 of yacc.c */
--#line 5678 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5678 "sql/sql_yacc.yy"
- {}
- break;
-
- case 693:
-
--/* Line 1455 of yacc.c */
--#line 5679 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5679 "sql/sql_yacc.yy"
- {}
- break;
-
- case 694:
-
--/* Line 1455 of yacc.c */
--#line 5683 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5683 "sql/sql_yacc.yy"
- {}
- break;
-
- case 695:
-
--/* Line 1455 of yacc.c */
--#line 5684 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5684 "sql/sql_yacc.yy"
- {}
- break;
-
- case 696:
-
--/* Line 1455 of yacc.c */
--#line 5688 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5688 "sql/sql_yacc.yy"
- {}
- break;
-
- case 698:
-
--/* Line 1455 of yacc.c */
--#line 5693 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5693 "sql/sql_yacc.yy"
- { Lex->type&= ~ NOT_NULL_FLAG; }
- break;
-
- case 699:
-
--/* Line 1455 of yacc.c */
--#line 5694 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5694 "sql/sql_yacc.yy"
- { Lex->type|= NOT_NULL_FLAG; }
- break;
-
- case 700:
-
--/* Line 1455 of yacc.c */
--#line 5695 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5695 "sql/sql_yacc.yy"
- { Lex->default_value=(yyvsp[(2) - (2)].item); }
- break;
-
- case 701:
-
--/* Line 1455 of yacc.c */
--#line 5697 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5697 "sql/sql_yacc.yy"
- {
- Item *item= new (YYTHD->mem_root) Item_func_now_local();
- if (item == NULL)
-@@ -22484,15 +22514,15 @@
-
- case 702:
-
--/* Line 1455 of yacc.c */
--#line 5703 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5703 "sql/sql_yacc.yy"
- { Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG; }
- break;
-
- case 703:
-
--/* Line 1455 of yacc.c */
--#line 5705 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5705 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG;
-@@ -22502,8 +22532,8 @@
-
- case 704:
-
--/* Line 1455 of yacc.c */
--#line 5711 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5711 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG;
-@@ -22513,8 +22543,8 @@
-
- case 705:
-
--/* Line 1455 of yacc.c */
--#line 5717 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5717 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->type|= UNIQUE_FLAG;
-@@ -22524,8 +22554,8 @@
-
- case 706:
-
--/* Line 1455 of yacc.c */
--#line 5723 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5723 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->type|= UNIQUE_KEY_FLAG;
-@@ -22535,15 +22565,15 @@
-
- case 707:
-
--/* Line 1455 of yacc.c */
--#line 5728 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5728 "sql/sql_yacc.yy"
- { Lex->comment= (yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 708:
-
--/* Line 1455 of yacc.c */
--#line 5730 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5730 "sql/sql_yacc.yy"
- {
- if (Lex->charset && !my_charset_same(Lex->charset,(yyvsp[(2) - (2)].charset)))
- {
-@@ -22560,8 +22590,8 @@
-
- case 709:
-
--/* Line 1455 of yacc.c */
--#line 5747 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5747 "sql/sql_yacc.yy"
- {
- (yyval.num)= (yyvsp[(1) - (2)].num);
-
-@@ -22582,8 +22612,8 @@
-
- case 710:
-
--/* Line 1455 of yacc.c */
--#line 5768 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5768 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_now_local();
- if ((yyval.item) == NULL)
-@@ -22593,29 +22623,29 @@
-
- case 711:
-
--/* Line 1455 of yacc.c */
--#line 5774 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5774 "sql/sql_yacc.yy"
- { (yyval.item)=(yyvsp[(1) - (1)].item); }
- break;
-
- case 712:
-
--/* Line 1455 of yacc.c */
--#line 5778 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5778 "sql/sql_yacc.yy"
- {}
- break;
-
- case 713:
-
--/* Line 1455 of yacc.c */
--#line 5779 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5779 "sql/sql_yacc.yy"
- {}
- break;
-
- case 714:
-
--/* Line 1455 of yacc.c */
--#line 5784 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5784 "sql/sql_yacc.yy"
- {
- if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))))
- {
-@@ -22627,43 +22657,43 @@
-
- case 715:
-
--/* Line 1455 of yacc.c */
--#line 5791 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5791 "sql/sql_yacc.yy"
- { (yyval.charset)= &my_charset_bin; }
- break;
-
- case 716:
-
--/* Line 1455 of yacc.c */
--#line 5795 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5795 "sql/sql_yacc.yy"
- { (yyval.charset)=(yyvsp[(1) - (1)].charset); }
- break;
-
- case 717:
-
--/* Line 1455 of yacc.c */
--#line 5796 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5796 "sql/sql_yacc.yy"
- { (yyval.charset)=NULL; }
- break;
-
- case 718:
-
--/* Line 1455 of yacc.c */
--#line 5800 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5800 "sql/sql_yacc.yy"
- { (yyval.charset)= NULL; }
- break;
-
- case 719:
-
--/* Line 1455 of yacc.c */
--#line 5801 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5801 "sql/sql_yacc.yy"
- { (yyval.charset)= (yyvsp[(2) - (2)].charset); }
- break;
-
- case 720:
-
--/* Line 1455 of yacc.c */
--#line 5806 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5806 "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)))
-@@ -22676,29 +22706,29 @@
-
- case 721:
-
--/* Line 1455 of yacc.c */
--#line 5814 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5814 "sql/sql_yacc.yy"
- { (yyval.charset)= &my_charset_bin; }
- break;
-
- case 722:
-
--/* Line 1455 of yacc.c */
--#line 5818 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5818 "sql/sql_yacc.yy"
- { (yyval.charset)=(yyvsp[(1) - (1)].charset); }
- break;
-
- case 723:
-
--/* Line 1455 of yacc.c */
--#line 5819 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5819 "sql/sql_yacc.yy"
- { (yyval.charset)=NULL; }
- break;
-
- case 724:
-
--/* Line 1455 of yacc.c */
--#line 5824 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5824 "sql/sql_yacc.yy"
- {
- if (!((yyval.charset)=get_charset_by_name((yyvsp[(1) - (1)].lex_str).str,MYF(0))))
- {
-@@ -22710,57 +22740,57 @@
-
- case 725:
-
--/* Line 1455 of yacc.c */
--#line 5834 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5834 "sql/sql_yacc.yy"
- { (yyval.charset)=NULL; }
- break;
-
- case 726:
-
--/* Line 1455 of yacc.c */
--#line 5835 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5835 "sql/sql_yacc.yy"
- { (yyval.charset)=(yyvsp[(2) - (2)].charset); }
- break;
-
- case 727:
-
--/* Line 1455 of yacc.c */
--#line 5839 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5839 "sql/sql_yacc.yy"
- { (yyval.charset)=(yyvsp[(1) - (1)].charset); }
- break;
-
- case 728:
-
--/* Line 1455 of yacc.c */
--#line 5840 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5840 "sql/sql_yacc.yy"
- { (yyval.charset)=NULL; }
- break;
-
- case 729:
-
--/* Line 1455 of yacc.c */
--#line 5844 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5844 "sql/sql_yacc.yy"
- {}
- break;
-
- case 730:
-
--/* Line 1455 of yacc.c */
--#line 5845 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5845 "sql/sql_yacc.yy"
- {}
- break;
-
- case 731:
-
--/* Line 1455 of yacc.c */
--#line 5850 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5850 "sql/sql_yacc.yy"
- { Lex->charset= &my_charset_latin1; }
- break;
-
- case 732:
-
--/* Line 1455 of yacc.c */
--#line 5852 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5852 "sql/sql_yacc.yy"
- {
- Lex->charset= &my_charset_latin1_bin;
- }
-@@ -22768,8 +22798,8 @@
-
- case 733:
-
--/* Line 1455 of yacc.c */
--#line 5856 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5856 "sql/sql_yacc.yy"
- {
- Lex->charset= &my_charset_latin1_bin;
- }
-@@ -22777,8 +22807,8 @@
-
- case 734:
-
--/* Line 1455 of yacc.c */
--#line 5863 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5863 "sql/sql_yacc.yy"
- {
- if (!(Lex->charset=get_charset_by_csname("ucs2",
- MY_CS_PRIMARY,MYF(0))))
-@@ -22791,8 +22821,8 @@
-
- case 735:
-
--/* Line 1455 of yacc.c */
--#line 5872 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5872 "sql/sql_yacc.yy"
- {
- if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
- {
-@@ -22804,8 +22834,8 @@
-
- case 736:
-
--/* Line 1455 of yacc.c */
--#line 5880 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5880 "sql/sql_yacc.yy"
- {
- if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
- {
-@@ -22817,29 +22847,29 @@
-
- case 737:
-
--/* Line 1455 of yacc.c */
--#line 5890 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5890 "sql/sql_yacc.yy"
- { Lex->charset=NULL; }
- break;
-
- case 740:
-
--/* Line 1455 of yacc.c */
--#line 5893 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5893 "sql/sql_yacc.yy"
- { Lex->charset=&my_charset_bin; }
- break;
-
- case 741:
-
--/* Line 1455 of yacc.c */
--#line 5894 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5894 "sql/sql_yacc.yy"
- { Lex->charset=(yyvsp[(2) - (3)].charset); }
- break;
-
- case 742:
-
--/* Line 1455 of yacc.c */
--#line 5896 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5896 "sql/sql_yacc.yy"
- {
- Lex->charset= NULL;
- Lex->type|= BINCMP_FLAG;
-@@ -22848,8 +22878,8 @@
-
- case 743:
-
--/* Line 1455 of yacc.c */
--#line 5901 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5901 "sql/sql_yacc.yy"
- {
- Lex->charset= (yyvsp[(3) - (3)].charset);
- Lex->type|= BINCMP_FLAG;
-@@ -22858,22 +22888,22 @@
-
- case 744:
-
--/* Line 1455 of yacc.c */
--#line 5908 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5908 "sql/sql_yacc.yy"
- { }
- break;
-
- case 745:
-
--/* Line 1455 of yacc.c */
--#line 5909 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5909 "sql/sql_yacc.yy"
- { Lex->type|= BINCMP_FLAG; }
- break;
-
- case 748:
-
--/* Line 1455 of yacc.c */
--#line 5924 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5924 "sql/sql_yacc.yy"
- {
- (yyval.table)=(yyvsp[(2) - (5)].table);
- }
-@@ -22881,15 +22911,15 @@
-
- case 749:
-
--/* Line 1455 of yacc.c */
--#line 5931 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5931 "sql/sql_yacc.yy"
- { Lex->ref_list.empty(); }
- break;
-
- case 751:
-
--/* Line 1455 of yacc.c */
--#line 5937 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5937 "sql/sql_yacc.yy"
- {
- Key_part_spec *key= new Key_part_spec((yyvsp[(3) - (3)].lex_str), 0);
- if (key == NULL)
-@@ -22900,8 +22930,8 @@
-
- case 752:
-
--/* Line 1455 of yacc.c */
--#line 5944 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5944 "sql/sql_yacc.yy"
- {
- Key_part_spec *key= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
- if (key == NULL)
-@@ -22914,36 +22944,36 @@
-
- case 753:
-
--/* Line 1455 of yacc.c */
--#line 5956 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5956 "sql/sql_yacc.yy"
- { Lex->fk_match_option= Foreign_key::FK_MATCH_UNDEF; }
- break;
-
- case 754:
-
--/* Line 1455 of yacc.c */
--#line 5958 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5958 "sql/sql_yacc.yy"
- { Lex->fk_match_option= Foreign_key::FK_MATCH_FULL; }
- break;
-
- case 755:
-
--/* Line 1455 of yacc.c */
--#line 5960 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5960 "sql/sql_yacc.yy"
- { Lex->fk_match_option= Foreign_key::FK_MATCH_PARTIAL; }
- break;
-
- case 756:
-
--/* Line 1455 of yacc.c */
--#line 5962 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5962 "sql/sql_yacc.yy"
- { Lex->fk_match_option= Foreign_key::FK_MATCH_SIMPLE; }
- break;
-
- case 757:
-
--/* Line 1455 of yacc.c */
--#line 5967 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5967 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
-@@ -22953,8 +22983,8 @@
-
- case 758:
-
--/* Line 1455 of yacc.c */
--#line 5973 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5973 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->fk_update_opt= (yyvsp[(3) - (3)].m_fk_option);
-@@ -22964,8 +22994,8 @@
-
- case 759:
-
--/* Line 1455 of yacc.c */
--#line 5979 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5979 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
-@@ -22975,8 +23005,8 @@
-
- case 760:
-
--/* Line 1455 of yacc.c */
--#line 5986 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5986 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->fk_update_opt= (yyvsp[(3) - (6)].m_fk_option);
-@@ -22986,8 +23016,8 @@
-
- case 761:
-
--/* Line 1455 of yacc.c */
--#line 5993 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 5993 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->fk_update_opt= (yyvsp[(6) - (6)].m_fk_option);
-@@ -22997,127 +23027,127 @@
-
- case 762:
-
--/* Line 1455 of yacc.c */
--#line 6001 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6001 "sql/sql_yacc.yy"
- { (yyval.m_fk_option)= Foreign_key::FK_OPTION_RESTRICT; }
- break;
-
- case 763:
-
--/* Line 1455 of yacc.c */
--#line 6002 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6002 "sql/sql_yacc.yy"
- { (yyval.m_fk_option)= Foreign_key::FK_OPTION_CASCADE; }
- break;
-
- case 764:
-
--/* Line 1455 of yacc.c */
--#line 6003 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6003 "sql/sql_yacc.yy"
- { (yyval.m_fk_option)= Foreign_key::FK_OPTION_SET_NULL; }
- break;
-
- case 765:
-
--/* Line 1455 of yacc.c */
--#line 6004 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6004 "sql/sql_yacc.yy"
- { (yyval.m_fk_option)= Foreign_key::FK_OPTION_NO_ACTION; }
- break;
-
- case 766:
-
--/* Line 1455 of yacc.c */
--#line 6005 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6005 "sql/sql_yacc.yy"
- { (yyval.m_fk_option)= Foreign_key::FK_OPTION_DEFAULT; }
- break;
-
- case 767:
-
--/* Line 1455 of yacc.c */
--#line 6009 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6009 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::MULTIPLE; }
- break;
-
- case 768:
-
--/* Line 1455 of yacc.c */
--#line 6013 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6013 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::PRIMARY; }
- break;
-
- case 769:
-
--/* Line 1455 of yacc.c */
--#line 6014 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6014 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::UNIQUE; }
- break;
-
- case 770:
-
--/* Line 1455 of yacc.c */
--#line 6018 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6018 "sql/sql_yacc.yy"
- {}
- break;
-
- case 771:
-
--/* Line 1455 of yacc.c */
--#line 6019 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6019 "sql/sql_yacc.yy"
- {}
- break;
-
- case 772:
-
--/* Line 1455 of yacc.c */
--#line 6023 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6023 "sql/sql_yacc.yy"
- {}
- break;
-
- case 774:
-
--/* Line 1455 of yacc.c */
--#line 6028 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6028 "sql/sql_yacc.yy"
- {}
- break;
-
- case 775:
-
--/* Line 1455 of yacc.c */
--#line 6029 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6029 "sql/sql_yacc.yy"
- {}
- break;
-
- case 776:
-
--/* Line 1455 of yacc.c */
--#line 6030 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6030 "sql/sql_yacc.yy"
- {}
- break;
-
- case 777:
-
--/* Line 1455 of yacc.c */
--#line 6034 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6034 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::MULTIPLE; }
- break;
-
- case 778:
-
--/* Line 1455 of yacc.c */
--#line 6035 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6035 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::UNIQUE; }
- break;
-
- case 779:
-
--/* Line 1455 of yacc.c */
--#line 6039 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6039 "sql/sql_yacc.yy"
- { (yyval.key_type)= Key::FULLTEXT;}
- break;
-
- case 780:
-
--/* Line 1455 of yacc.c */
--#line 6044 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6044 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_SPATIAL
- (yyval.key_type)= Key::SPATIAL;
-@@ -23131,8 +23161,8 @@
-
- case 781:
-
--/* Line 1455 of yacc.c */
--#line 6056 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6056 "sql/sql_yacc.yy"
- {
- Lex->key_create_info= default_key_create_info;
- }
-@@ -23140,57 +23170,57 @@
-
- case 784:
-
--/* Line 1455 of yacc.c */
--#line 6073 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6073 "sql/sql_yacc.yy"
- {}
- break;
-
- case 786:
-
--/* Line 1455 of yacc.c */
--#line 6078 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6078 "sql/sql_yacc.yy"
- {}
- break;
-
- case 788:
-
--/* Line 1455 of yacc.c */
--#line 6083 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6083 "sql/sql_yacc.yy"
- {}
- break;
-
- case 796:
-
--/* Line 1455 of yacc.c */
--#line 6103 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6103 "sql/sql_yacc.yy"
- { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
- break;
-
- case 797:
-
--/* Line 1455 of yacc.c */
--#line 6104 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6104 "sql/sql_yacc.yy"
- { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
- break;
-
- case 798:
-
--/* Line 1455 of yacc.c */
--#line 6109 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6109 "sql/sql_yacc.yy"
- { Lex->key_create_info.block_size= (yyvsp[(3) - (3)].ulong_num); }
- break;
-
- case 799:
-
--/* Line 1455 of yacc.c */
--#line 6110 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6110 "sql/sql_yacc.yy"
- { Lex->key_create_info.comment= (yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 804:
-
--/* Line 1455 of yacc.c */
--#line 6125 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6125 "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);
-@@ -23204,43 +23234,43 @@
-
- case 805:
-
--/* Line 1455 of yacc.c */
--#line 6137 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6137 "sql/sql_yacc.yy"
- { (yyval.key_alg)= HA_KEY_ALG_BTREE; }
- break;
-
- case 806:
-
--/* Line 1455 of yacc.c */
--#line 6138 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6138 "sql/sql_yacc.yy"
- { (yyval.key_alg)= HA_KEY_ALG_RTREE; }
- break;
-
- case 807:
-
--/* Line 1455 of yacc.c */
--#line 6139 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6139 "sql/sql_yacc.yy"
- { (yyval.key_alg)= HA_KEY_ALG_HASH; }
- break;
-
- case 808:
-
--/* Line 1455 of yacc.c */
--#line 6143 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6143 "sql/sql_yacc.yy"
- { Lex->col_list.push_back((yyvsp[(3) - (4)].key_part)); }
- break;
-
- case 809:
-
--/* Line 1455 of yacc.c */
--#line 6144 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6144 "sql/sql_yacc.yy"
- { Lex->col_list.push_back((yyvsp[(1) - (2)].key_part)); }
- break;
-
- case 810:
-
--/* Line 1455 of yacc.c */
--#line 6149 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6149 "sql/sql_yacc.yy"
- {
- (yyval.key_part)= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
- if ((yyval.key_part) == NULL)
-@@ -23250,8 +23280,8 @@
-
- case 811:
-
--/* Line 1455 of yacc.c */
--#line 6155 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6155 "sql/sql_yacc.yy"
- {
- int key_part_len= atoi((yyvsp[(3) - (4)].lex_str).str);
- if (!key_part_len)
-@@ -23266,50 +23296,50 @@
-
- case 812:
-
--/* Line 1455 of yacc.c */
--#line 6168 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6168 "sql/sql_yacc.yy"
- { (yyval.lex_str)= null_lex_str; }
- break;
-
- case 813:
-
--/* Line 1455 of yacc.c */
--#line 6169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6169 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 814:
-
--/* Line 1455 of yacc.c */
--#line 6173 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6173 "sql/sql_yacc.yy"
- { (yyval.lex_str)= null_lex_str; }
- break;
-
- case 815:
-
--/* Line 1455 of yacc.c */
--#line 6174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6174 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 816:
-
--/* Line 1455 of yacc.c */
--#line 6178 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6178 "sql/sql_yacc.yy"
- { Lex->interval_list.push_back((yyvsp[(1) - (1)].string)); }
- break;
-
- case 817:
-
--/* Line 1455 of yacc.c */
--#line 6179 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6179 "sql/sql_yacc.yy"
- { Lex->interval_list.push_back((yyvsp[(3) - (3)].string)); }
- break;
-
- case 818:
-
--/* Line 1455 of yacc.c */
--#line 6187 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6187 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23339,8 +23369,8 @@
-
- case 819:
-
--/* Line 1455 of yacc.c */
--#line 6213 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6213 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23356,8 +23386,8 @@
-
- case 820:
-
--/* Line 1455 of yacc.c */
--#line 6225 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6225 "sql/sql_yacc.yy"
- {
- Lex->create_info.default_table_charset= NULL;
- Lex->create_info.used_fields= 0;
-@@ -23366,8 +23396,8 @@
-
- case 821:
-
--/* Line 1455 of yacc.c */
--#line 6230 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6230 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command=SQLCOM_ALTER_DB;
-@@ -23380,8 +23410,8 @@
-
- case 822:
-
--/* Line 1455 of yacc.c */
--#line 6239 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6239 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->sphead)
-@@ -23396,8 +23426,8 @@
-
- case 823:
-
--/* Line 1455 of yacc.c */
--#line 6250 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6250 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -23412,8 +23442,8 @@
-
- case 824:
-
--/* Line 1455 of yacc.c */
--#line 6261 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6261 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
-
-@@ -23424,8 +23454,8 @@
-
- case 825:
-
--/* Line 1455 of yacc.c */
--#line 6268 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6268 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -23440,8 +23470,8 @@
-
- case 826:
-
--/* Line 1455 of yacc.c */
--#line 6279 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6279 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
-
-@@ -23452,8 +23482,8 @@
-
- case 827:
-
--/* Line 1455 of yacc.c */
--#line 6286 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6286 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -23468,15 +23498,15 @@
-
- case 828:
-
--/* Line 1455 of yacc.c */
--#line 6297 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6297 "sql/sql_yacc.yy"
- {}
- break;
-
- case 829:
-
--/* Line 1455 of yacc.c */
--#line 6304 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6304 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -23492,15 +23522,15 @@
-
- case 830:
-
--/* Line 1455 of yacc.c */
--#line 6316 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6316 "sql/sql_yacc.yy"
- {}
- break;
-
- case 831:
-
--/* Line 1455 of yacc.c */
--#line 6318 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6318 "sql/sql_yacc.yy"
- {
- /*
- It is safe to use Lex->spname because
-@@ -23520,8 +23550,8 @@
-
- case 832:
-
--/* Line 1455 of yacc.c */
--#line 6338 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6338 "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)))
- {
-@@ -23538,8 +23568,8 @@
-
- case 833:
-
--/* Line 1455 of yacc.c */
--#line 6351 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6351 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE;
-@@ -23548,8 +23578,8 @@
-
- case 834:
-
--/* Line 1455 of yacc.c */
--#line 6356 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6356 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP;
-@@ -23558,8 +23588,8 @@
-
- case 835:
-
--/* Line 1455 of yacc.c */
--#line 6361 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6361 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE;
-@@ -23568,8 +23598,8 @@
-
- case 836:
-
--/* Line 1455 of yacc.c */
--#line 6366 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6366 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE;
-@@ -23578,8 +23608,8 @@
-
- case 837:
-
--/* Line 1455 of yacc.c */
--#line 6371 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6371 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_ALTER_SERVER;
-@@ -23590,43 +23620,43 @@
-
- case 838:
-
--/* Line 1455 of yacc.c */
--#line 6380 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6380 "sql/sql_yacc.yy"
- { (yyval.num)= 0;}
- break;
-
- case 839:
-
--/* Line 1455 of yacc.c */
--#line 6381 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6381 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 840:
-
--/* Line 1455 of yacc.c */
--#line 6382 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6382 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 841:
-
--/* Line 1455 of yacc.c */
--#line 6383 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6383 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 842:
-
--/* Line 1455 of yacc.c */
--#line 6387 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6387 "sql/sql_yacc.yy"
- { (yyval.num)= 0;}
- break;
-
- case 843:
-
--/* Line 1455 of yacc.c */
--#line 6389 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6389 "sql/sql_yacc.yy"
- {
- /*
- Use lex's spname to hold the new name.
-@@ -23639,50 +23669,50 @@
-
- case 844:
-
--/* Line 1455 of yacc.c */
--#line 6400 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6400 "sql/sql_yacc.yy"
- { (yyval.num)= 0;}
- break;
-
- case 845:
-
--/* Line 1455 of yacc.c */
--#line 6401 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6401 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 846:
-
--/* Line 1455 of yacc.c */
--#line 6405 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6405 "sql/sql_yacc.yy"
- { (yyval.lex_str).str= 0; (yyval.lex_str).length= 0; }
- break;
-
- case 847:
-
--/* Line 1455 of yacc.c */
--#line 6406 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6406 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 849:
-
--/* Line 1455 of yacc.c */
--#line 6411 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6411 "sql/sql_yacc.yy"
- { Lex->alter_info.tablespace_op= DISCARD_TABLESPACE; }
- break;
-
- case 850:
-
--/* Line 1455 of yacc.c */
--#line 6412 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6412 "sql/sql_yacc.yy"
- { Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; }
- break;
-
- case 856:
-
--/* Line 1455 of yacc.c */
--#line 6429 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6429 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_DROP_PARTITION;
- }
-@@ -23690,8 +23720,8 @@
-
- case 857:
-
--/* Line 1455 of yacc.c */
--#line 6434 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6434 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_info.flags|= ALTER_REBUILD_PARTITION;
-@@ -23701,8 +23731,8 @@
-
- case 858:
-
--/* Line 1455 of yacc.c */
--#line 6441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6441 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23718,8 +23748,8 @@
-
- case 860:
-
--/* Line 1455 of yacc.c */
--#line 6455 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6455 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23735,8 +23765,8 @@
-
- case 861:
-
--/* Line 1455 of yacc.c */
--#line 6467 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6467 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23751,8 +23781,8 @@
-
- case 863:
-
--/* Line 1455 of yacc.c */
--#line 6480 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6480 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23768,8 +23798,8 @@
-
- case 865:
-
--/* Line 1455 of yacc.c */
--#line 6493 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6493 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_info.flags|= ALTER_COALESCE_PARTITION;
-@@ -23780,8 +23810,8 @@
-
- case 866:
-
--/* Line 1455 of yacc.c */
--#line 6500 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6500 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -23796,8 +23826,8 @@
-
- case 868:
-
--/* Line 1455 of yacc.c */
--#line 6515 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6515 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_REMOVE_PARTITIONING;
- }
-@@ -23805,8 +23835,8 @@
-
- case 869:
-
--/* Line 1455 of yacc.c */
--#line 6522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6522 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_ALL_PARTITION;
- }
-@@ -23814,8 +23844,8 @@
-
- case 871:
-
--/* Line 1455 of yacc.c */
--#line 6530 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6530 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->part_info= new partition_info();
-@@ -23831,15 +23861,15 @@
-
- case 872:
-
--/* Line 1455 of yacc.c */
--#line 6542 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6542 "sql/sql_yacc.yy"
- {}
- break;
-
- case 874:
-
--/* Line 1455 of yacc.c */
--#line 6548 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6548 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->part_info->num_parts= lex->part_info->partitions.elements;
-@@ -23848,8 +23878,8 @@
-
- case 875:
-
--/* Line 1455 of yacc.c */
--#line 6553 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6553 "sql/sql_yacc.yy"
- {
- Lex->part_info->num_parts= (yyvsp[(2) - (2)].ulong_num);
- }
-@@ -23857,8 +23887,8 @@
-
- case 876:
-
--/* Line 1455 of yacc.c */
--#line 6560 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6560 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->part_info= new partition_info();
-@@ -23873,8 +23903,8 @@
-
- case 878:
-
--/* Line 1455 of yacc.c */
--#line 6575 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6575 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_TABLE_REORG;
- }
-@@ -23882,8 +23912,8 @@
-
- case 879:
-
--/* Line 1455 of yacc.c */
--#line 6579 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6579 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_REORGANIZE_PARTITION;
- }
-@@ -23891,8 +23921,8 @@
-
- case 880:
-
--/* Line 1455 of yacc.c */
--#line 6583 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6583 "sql/sql_yacc.yy"
- {
- partition_info *part_info= Lex->part_info;
- part_info->num_parts= part_info->partitions.elements;
-@@ -23901,22 +23931,22 @@
-
- case 881:
-
--/* Line 1455 of yacc.c */
--#line 6590 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6590 "sql/sql_yacc.yy"
- {}
- break;
-
- case 882:
-
--/* Line 1455 of yacc.c */
--#line 6591 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6591 "sql/sql_yacc.yy"
- {}
- break;
-
- case 883:
-
--/* Line 1455 of yacc.c */
--#line 6596 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6596 "sql/sql_yacc.yy"
- {
- if (Lex->alter_info.partition_names.push_back((yyvsp[(1) - (1)].lex_str).str))
- {
-@@ -23928,8 +23958,8 @@
-
- case 886:
-
--/* Line 1455 of yacc.c */
--#line 6616 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6616 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->change=0;
-@@ -23939,8 +23969,8 @@
-
- case 887:
-
--/* Line 1455 of yacc.c */
--#line 6625 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6625 "sql/sql_yacc.yy"
- {
- Lex->create_last_non_select_table= Lex->last_table();
- }
-@@ -23948,8 +23978,8 @@
-
- case 888:
-
--/* Line 1455 of yacc.c */
--#line 6629 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6629 "sql/sql_yacc.yy"
- {
- Lex->create_last_non_select_table= Lex->last_table();
- Lex->alter_info.flags|= ALTER_ADD_INDEX;
-@@ -23958,8 +23988,8 @@
-
- case 889:
-
--/* Line 1455 of yacc.c */
--#line 6634 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6634 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_ADD_COLUMN | ALTER_ADD_INDEX;
- }
-@@ -23967,8 +23997,8 @@
-
- case 890:
-
--/* Line 1455 of yacc.c */
--#line 6638 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6638 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->change= (yyvsp[(3) - (3)].lex_str).str;
-@@ -23978,8 +24008,8 @@
-
- case 891:
-
--/* Line 1455 of yacc.c */
--#line 6644 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6644 "sql/sql_yacc.yy"
- {
- Lex->create_last_non_select_table= Lex->last_table();
- }
-@@ -23987,8 +24017,8 @@
-
- case 892:
-
--/* Line 1455 of yacc.c */
--#line 6648 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6648 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->length=lex->dec=0; lex->type=0;
-@@ -24001,8 +24031,8 @@
-
- case 893:
-
--/* Line 1455 of yacc.c */
--#line 6657 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6657 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (add_field_to_list(lex->thd,&(yyvsp[(3) - (6)].lex_str),
-@@ -24018,8 +24048,8 @@
-
- case 894:
-
--/* Line 1455 of yacc.c */
--#line 6669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6669 "sql/sql_yacc.yy"
- {
- Lex->create_last_non_select_table= Lex->last_table();
- }
-@@ -24027,8 +24057,8 @@
-
- case 895:
-
--/* Line 1455 of yacc.c */
--#line 6673 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6673 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, (yyvsp[(3) - (4)].lex_str).str);
-@@ -24041,8 +24071,8 @@
-
- case 896:
-
--/* Line 1455 of yacc.c */
--#line 6682 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6682 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_DROP_INDEX | ALTER_FOREIGN_KEY;
- }
-@@ -24050,8 +24080,8 @@
-
- case 897:
-
--/* Line 1455 of yacc.c */
--#line 6686 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6686 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name);
-@@ -24064,8 +24094,8 @@
-
- case 898:
-
--/* Line 1455 of yacc.c */
--#line 6695 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6695 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (3)].lex_str).str);
-@@ -24078,8 +24108,8 @@
-
- case 899:
-
--/* Line 1455 of yacc.c */
--#line 6704 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6704 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->alter_info.keys_onoff= DISABLE;
-@@ -24089,8 +24119,8 @@
-
- case 900:
-
--/* Line 1455 of yacc.c */
--#line 6710 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6710 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->alter_info.keys_onoff= ENABLE;
-@@ -24100,8 +24130,8 @@
-
- case 901:
-
--/* Line 1455 of yacc.c */
--#line 6716 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6716 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_column *ac= new Alter_column((yyvsp[(3) - (6)].lex_str).str,(yyvsp[(6) - (6)].item));
-@@ -24114,8 +24144,8 @@
-
- case 902:
-
--/* Line 1455 of yacc.c */
--#line 6725 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6725 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_column *ac= new Alter_column((yyvsp[(3) - (5)].lex_str).str, (Item*) 0);
-@@ -24128,8 +24158,8 @@
-
- case 903:
-
--/* Line 1455 of yacc.c */
--#line 6734 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6734 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- size_t dummy;
-@@ -24152,8 +24182,8 @@
-
- case 904:
-
--/* Line 1455 of yacc.c */
--#line 6753 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6753 "sql/sql_yacc.yy"
- {
- if (!(yyvsp[(4) - (5)].charset))
- {
-@@ -24178,8 +24208,8 @@
-
- case 905:
-
--/* Line 1455 of yacc.c */
--#line 6774 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6774 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->alter_info.flags|= ALTER_OPTIONS;
-@@ -24193,8 +24223,8 @@
-
- case 906:
-
--/* Line 1455 of yacc.c */
--#line 6784 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6784 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_RECREATE;
- }
-@@ -24202,8 +24232,8 @@
-
- case 907:
-
--/* Line 1455 of yacc.c */
--#line 6788 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6788 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->alter_info.flags|= ALTER_ORDER;
-@@ -24212,106 +24242,106 @@
-
- case 908:
-
--/* Line 1455 of yacc.c */
--#line 6795 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6795 "sql/sql_yacc.yy"
- {}
- break;
-
- case 909:
-
--/* Line 1455 of yacc.c */
--#line 6796 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6796 "sql/sql_yacc.yy"
- {}
- break;
-
- case 910:
-
--/* Line 1455 of yacc.c */
--#line 6800 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6800 "sql/sql_yacc.yy"
- { Lex->ignore= 0;}
- break;
-
- case 911:
-
--/* Line 1455 of yacc.c */
--#line 6801 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6801 "sql/sql_yacc.yy"
- { Lex->ignore= 1;}
- break;
-
- case 912:
-
--/* Line 1455 of yacc.c */
--#line 6805 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6805 "sql/sql_yacc.yy"
- { Lex->drop_mode= DROP_DEFAULT; }
- break;
-
- case 913:
-
--/* Line 1455 of yacc.c */
--#line 6806 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6806 "sql/sql_yacc.yy"
- { Lex->drop_mode= DROP_RESTRICT; }
- break;
-
- case 914:
-
--/* Line 1455 of yacc.c */
--#line 6807 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6807 "sql/sql_yacc.yy"
- { Lex->drop_mode= DROP_CASCADE; }
- break;
-
- case 915:
-
--/* Line 1455 of yacc.c */
--#line 6811 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6811 "sql/sql_yacc.yy"
- {}
- break;
-
- case 916:
-
--/* Line 1455 of yacc.c */
--#line 6812 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6812 "sql/sql_yacc.yy"
- { store_position_for_column((yyvsp[(2) - (2)].lex_str).str); }
- break;
-
- case 917:
-
--/* Line 1455 of yacc.c */
--#line 6813 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6813 "sql/sql_yacc.yy"
- { store_position_for_column(first_keyword); }
- break;
-
- case 918:
-
--/* Line 1455 of yacc.c */
--#line 6817 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6817 "sql/sql_yacc.yy"
- {}
- break;
-
- case 919:
-
--/* Line 1455 of yacc.c */
--#line 6818 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6818 "sql/sql_yacc.yy"
- {}
- break;
-
- case 920:
-
--/* Line 1455 of yacc.c */
--#line 6819 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6819 "sql/sql_yacc.yy"
- {}
- break;
-
- case 921:
-
--/* Line 1455 of yacc.c */
--#line 6820 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6820 "sql/sql_yacc.yy"
- {}
- break;
-
- case 922:
-
--/* Line 1455 of yacc.c */
--#line 6829 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6829 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_START;
-@@ -24324,15 +24354,15 @@
-
- case 923:
-
--/* Line 1455 of yacc.c */
--#line 6838 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6838 "sql/sql_yacc.yy"
- {}
- break;
-
- case 924:
-
--/* Line 1455 of yacc.c */
--#line 6840 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6840 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_STOP;
-@@ -24343,8 +24373,8 @@
-
- case 925:
-
--/* Line 1455 of yacc.c */
--#line 6847 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6847 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_START;
-@@ -24356,15 +24386,15 @@
-
- case 926:
-
--/* Line 1455 of yacc.c */
--#line 6855 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6855 "sql/sql_yacc.yy"
- {}
- break;
-
- case 927:
-
--/* Line 1455 of yacc.c */
--#line 6857 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6857 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_SLAVE_STOP;
-@@ -24374,8 +24404,8 @@
-
- case 928:
-
--/* Line 1455 of yacc.c */
--#line 6866 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6866 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_BEGIN;
-@@ -24385,15 +24415,15 @@
-
- case 929:
-
--/* Line 1455 of yacc.c */
--#line 6874 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6874 "sql/sql_yacc.yy"
- { (yyval.num) = 0; }
- break;
-
- case 930:
-
--/* Line 1455 of yacc.c */
--#line 6876 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6876 "sql/sql_yacc.yy"
- {
- (yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
- }
-@@ -24401,50 +24431,50 @@
-
- case 931:
-
--/* Line 1455 of yacc.c */
--#line 6882 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6882 "sql/sql_yacc.yy"
- { Lex->slave_thd_opt= 0; }
- break;
-
- case 932:
-
--/* Line 1455 of yacc.c */
--#line 6884 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6884 "sql/sql_yacc.yy"
- {}
- break;
-
- case 935:
-
--/* Line 1455 of yacc.c */
--#line 6893 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6893 "sql/sql_yacc.yy"
- {}
- break;
-
- case 936:
-
--/* Line 1455 of yacc.c */
--#line 6894 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6894 "sql/sql_yacc.yy"
- { Lex->slave_thd_opt|=SLAVE_SQL; }
- break;
-
- case 937:
-
--/* Line 1455 of yacc.c */
--#line 6895 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6895 "sql/sql_yacc.yy"
- { Lex->slave_thd_opt|=SLAVE_IO; }
- break;
-
- case 938:
-
--/* Line 1455 of yacc.c */
--#line 6899 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6899 "sql/sql_yacc.yy"
- {}
- break;
-
- case 939:
-
--/* Line 1455 of yacc.c */
--#line 6901 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6901 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (((lex->mi.log_file_name || lex->mi.pos) &&
-@@ -24461,8 +24491,8 @@
-
- case 942:
-
--/* Line 1455 of yacc.c */
--#line 6922 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6922 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_CHECKSUM;
-@@ -24473,36 +24503,36 @@
-
- case 943:
-
--/* Line 1455 of yacc.c */
--#line 6929 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6929 "sql/sql_yacc.yy"
- {}
- break;
-
- case 944:
-
--/* Line 1455 of yacc.c */
--#line 6933 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6933 "sql/sql_yacc.yy"
- { Lex->check_opt.flags= 0; }
- break;
-
- case 945:
-
--/* Line 1455 of yacc.c */
--#line 6934 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6934 "sql/sql_yacc.yy"
- { Lex->check_opt.flags= T_QUICK; }
- break;
-
- case 946:
-
--/* Line 1455 of yacc.c */
--#line 6935 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6935 "sql/sql_yacc.yy"
- { Lex->check_opt.flags= T_EXTEND; }
- break;
-
- case 947:
-
--/* Line 1455 of yacc.c */
--#line 6940 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6940 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_REPAIR;
-@@ -24516,8 +24546,8 @@
-
- case 948:
-
--/* Line 1455 of yacc.c */
--#line 6950 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6950 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX* lex= thd->lex;
-@@ -24530,57 +24560,57 @@
-
- case 949:
-
--/* Line 1455 of yacc.c */
--#line 6961 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6961 "sql/sql_yacc.yy"
- { Lex->check_opt.flags = T_MEDIUM; }
- break;
-
- case 950:
-
--/* Line 1455 of yacc.c */
--#line 6962 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6962 "sql/sql_yacc.yy"
- {}
- break;
-
- case 951:
-
--/* Line 1455 of yacc.c */
--#line 6966 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6966 "sql/sql_yacc.yy"
- {}
- break;
-
- case 952:
-
--/* Line 1455 of yacc.c */
--#line 6967 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6967 "sql/sql_yacc.yy"
- {}
- break;
-
- case 953:
-
--/* Line 1455 of yacc.c */
--#line 6971 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6971 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_QUICK; }
- break;
-
- case 954:
-
--/* Line 1455 of yacc.c */
--#line 6972 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6972 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_EXTEND; }
- break;
-
- case 955:
-
--/* Line 1455 of yacc.c */
--#line 6973 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6973 "sql/sql_yacc.yy"
- { Lex->check_opt.sql_flags|= TT_USEFRM; }
- break;
-
- case 956:
-
--/* Line 1455 of yacc.c */
--#line 6978 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6978 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_ANALYZE;
-@@ -24594,8 +24624,8 @@
-
- case 957:
-
--/* Line 1455 of yacc.c */
--#line 6988 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 6988 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX* lex= thd->lex;
-@@ -24608,8 +24638,8 @@
-
- case 958:
-
--/* Line 1455 of yacc.c */
--#line 7000 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7000 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT;
- Lex->comment= (yyvsp[(2) - (2)].lex_str);
-@@ -24618,8 +24648,8 @@
-
- case 959:
-
--/* Line 1455 of yacc.c */
--#line 7008 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7008 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
-
-@@ -24638,8 +24668,8 @@
-
- case 960:
-
--/* Line 1455 of yacc.c */
--#line 7023 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7023 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX* lex= thd->lex;
-@@ -24652,78 +24682,78 @@
-
- case 961:
-
--/* Line 1455 of yacc.c */
--#line 7034 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7034 "sql/sql_yacc.yy"
- { Lex->check_opt.flags = T_MEDIUM; }
- break;
-
- case 962:
-
--/* Line 1455 of yacc.c */
--#line 7035 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7035 "sql/sql_yacc.yy"
- {}
- break;
-
- case 963:
-
--/* Line 1455 of yacc.c */
--#line 7039 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7039 "sql/sql_yacc.yy"
- {}
- break;
-
- case 964:
-
--/* Line 1455 of yacc.c */
--#line 7040 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7040 "sql/sql_yacc.yy"
- {}
- break;
-
- case 965:
-
--/* Line 1455 of yacc.c */
--#line 7044 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7044 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_QUICK; }
- break;
-
- case 966:
-
--/* Line 1455 of yacc.c */
--#line 7045 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7045 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_FAST; }
- break;
-
- case 967:
-
--/* Line 1455 of yacc.c */
--#line 7046 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7046 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_MEDIUM; }
- break;
-
- case 968:
-
--/* Line 1455 of yacc.c */
--#line 7047 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7047 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_EXTEND; }
- break;
-
- case 969:
-
--/* Line 1455 of yacc.c */
--#line 7048 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7048 "sql/sql_yacc.yy"
- { Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
- break;
-
- case 970:
-
--/* Line 1455 of yacc.c */
--#line 7049 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7049 "sql/sql_yacc.yy"
- { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
- break;
-
- case 971:
-
--/* Line 1455 of yacc.c */
--#line 7054 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7054 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_OPTIMIZE;
-@@ -24737,8 +24767,8 @@
-
- case 972:
-
--/* Line 1455 of yacc.c */
--#line 7064 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7064 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX* lex= thd->lex;
-@@ -24751,29 +24781,29 @@
-
- case 973:
-
--/* Line 1455 of yacc.c */
--#line 7075 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7075 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 974:
-
--/* Line 1455 of yacc.c */
--#line 7076 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7076 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 975:
-
--/* Line 1455 of yacc.c */
--#line 7077 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7077 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 976:
-
--/* Line 1455 of yacc.c */
--#line 7082 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7082 "sql/sql_yacc.yy"
- {
- Lex->sql_command= SQLCOM_RENAME_TABLE;
- }
-@@ -24781,15 +24811,15 @@
-
- case 977:
-
--/* Line 1455 of yacc.c */
--#line 7086 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7086 "sql/sql_yacc.yy"
- {}
- break;
-
- case 978:
-
--/* Line 1455 of yacc.c */
--#line 7088 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7088 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_RENAME_USER;
- }
-@@ -24797,8 +24827,8 @@
-
- case 979:
-
--/* Line 1455 of yacc.c */
--#line 7095 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7095 "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;
-@@ -24807,8 +24837,8 @@
-
- case 980:
-
--/* Line 1455 of yacc.c */
--#line 7100 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7100 "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;
-@@ -24817,8 +24847,8 @@
-
- case 983:
-
--/* Line 1455 of yacc.c */
--#line 7113 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7113 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- SELECT_LEX *sl= lex->current_select;
-@@ -24832,8 +24862,8 @@
-
- case 984:
-
--/* Line 1455 of yacc.c */
--#line 7126 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7126 "sql/sql_yacc.yy"
- {
- Lex->alter_info.reset();
- }
-@@ -24841,8 +24871,8 @@
-
- case 985:
-
--/* Line 1455 of yacc.c */
--#line 7130 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7130 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
-@@ -24852,8 +24882,8 @@
-
- case 990:
-
--/* Line 1455 of yacc.c */
--#line 7149 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7149 "sql/sql_yacc.yy"
- {
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL, 0, TL_READ,
- MDL_SHARED_READ,
-@@ -24864,8 +24894,8 @@
-
- case 991:
-
--/* Line 1455 of yacc.c */
--#line 7159 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7159 "sql/sql_yacc.yy"
- {
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, 0, TL_READ,
- MDL_SHARED_READ,
-@@ -24876,22 +24906,22 @@
-
- case 992:
-
--/* Line 1455 of yacc.c */
--#line 7168 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7168 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 993:
-
--/* Line 1455 of yacc.c */
--#line 7169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7169 "sql/sql_yacc.yy"
- { (yyval.lex_str) = default_key_cache_base; }
- break;
-
- case 994:
-
--/* Line 1455 of yacc.c */
--#line 7174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7174 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command=SQLCOM_PRELOAD_KEYS;
-@@ -24901,15 +24931,15 @@
-
- case 995:
-
--/* Line 1455 of yacc.c */
--#line 7180 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7180 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1000:
-
--/* Line 1455 of yacc.c */
--#line 7195 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7195 "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,
-@@ -24920,8 +24950,8 @@
-
- case 1001:
-
--/* Line 1455 of yacc.c */
--#line 7205 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7205 "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,
-@@ -24932,8 +24962,8 @@
-
- case 1002:
-
--/* Line 1455 of yacc.c */
--#line 7215 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7215 "sql/sql_yacc.yy"
- {
- Lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
- }
-@@ -24941,8 +24971,8 @@
-
- case 1004:
-
--/* Line 1455 of yacc.c */
--#line 7222 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7222 "sql/sql_yacc.yy"
- {
- Lex->select_lex.alloc_index_hints(YYTHD);
- Select->set_index_hint_type(INDEX_HINT_USE,
-@@ -24954,29 +24984,29 @@
-
- case 1006:
-
--/* Line 1455 of yacc.c */
--#line 7233 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7233 "sql/sql_yacc.yy"
- { }
- break;
-
- case 1008:
-
--/* Line 1455 of yacc.c */
--#line 7239 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7239 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 1009:
-
--/* Line 1455 of yacc.c */
--#line 7240 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7240 "sql/sql_yacc.yy"
- { (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
- break;
-
- case 1010:
-
--/* Line 1455 of yacc.c */
--#line 7250 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7250 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SELECT;
-@@ -24985,8 +25015,8 @@
-
- case 1013:
-
--/* Line 1455 of yacc.c */
--#line 7264 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7264 "sql/sql_yacc.yy"
- {
- if (setup_select_in_parentheses(Lex))
- MYSQL_YYABORT;
-@@ -24995,8 +25025,8 @@
-
- case 1015:
-
--/* Line 1455 of yacc.c */
--#line 7274 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7274 "sql/sql_yacc.yy"
- {
- if (setup_select_in_parentheses(Lex))
- MYSQL_YYABORT;
-@@ -25005,8 +25035,8 @@
-
- case 1017:
-
--/* Line 1455 of yacc.c */
--#line 7283 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7283 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX * sel= lex->current_select;
-@@ -25026,8 +25056,8 @@
-
- case 1019:
-
--/* Line 1455 of yacc.c */
--#line 7302 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7302 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX *sel= lex->current_select;
-@@ -25039,8 +25069,8 @@
-
- case 1020:
-
--/* Line 1455 of yacc.c */
--#line 7310 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7310 "sql/sql_yacc.yy"
- {
- Select->parsing_place= NO_MATTER;
- }
-@@ -25048,15 +25078,15 @@
-
- case 1022:
-
--/* Line 1455 of yacc.c */
--#line 7317 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7317 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1027:
-
--/* Line 1455 of yacc.c */
--#line 7327 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7327 "sql/sql_yacc.yy"
- {
- Select->context.table_list=
- Select->context.first_name_resolution_table=
-@@ -25066,8 +25096,8 @@
-
- case 1030:
-
--/* Line 1455 of yacc.c */
--#line 7342 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7342 "sql/sql_yacc.yy"
- {
- if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
- {
-@@ -25079,8 +25109,8 @@
-
- case 1034:
-
--/* Line 1455 of yacc.c */
--#line 7359 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7359 "sql/sql_yacc.yy"
- {
- /*
- Allow this flag only on the first top-level SELECT statement, if
-@@ -25112,8 +25142,8 @@
-
- case 1035:
-
--/* Line 1455 of yacc.c */
--#line 7387 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7387 "sql/sql_yacc.yy"
- {
- /*
- Allow this flag only on the first top-level SELECT statement, if
-@@ -25145,8 +25175,8 @@
-
- case 1037:
-
--/* Line 1455 of yacc.c */
--#line 7419 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7419 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->current_select->set_lock_for_tables(TL_WRITE);
-@@ -25156,8 +25186,8 @@
-
- case 1038:
-
--/* Line 1455 of yacc.c */
--#line 7425 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7425 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->current_select->
-@@ -25168,8 +25198,8 @@
-
- case 1041:
-
--/* Line 1455 of yacc.c */
--#line 7437 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7437 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Item *item= new (thd->mem_root)
-@@ -25185,8 +25215,8 @@
-
- case 1042:
-
--/* Line 1455 of yacc.c */
--#line 7452 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7452 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -25197,8 +25227,8 @@
-
- case 1043:
-
--/* Line 1455 of yacc.c */
--#line 7459 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7459 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- DBUG_ASSERT((yyvsp[(1) - (4)].simple_string) < (yyvsp[(3) - (4)].simple_string));
-@@ -25225,8 +25255,8 @@
-
- case 1044:
-
--/* Line 1455 of yacc.c */
--#line 7484 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7484 "sql/sql_yacc.yy"
- {
- (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start();
- }
-@@ -25234,8 +25264,8 @@
-
- case 1045:
-
--/* Line 1455 of yacc.c */
--#line 7490 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7490 "sql/sql_yacc.yy"
- {
- (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_end();
- }
-@@ -25243,57 +25273,57 @@
-
- case 1046:
-
--/* Line 1455 of yacc.c */
--#line 7496 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7496 "sql/sql_yacc.yy"
- { (yyval.lex_str)=null_lex_str;}
- break;
-
- case 1047:
-
--/* Line 1455 of yacc.c */
--#line 7497 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7497 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 1048:
-
--/* Line 1455 of yacc.c */
--#line 7498 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7498 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
- break;
-
- case 1049:
-
--/* Line 1455 of yacc.c */
--#line 7499 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7499 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 1050:
-
--/* Line 1455 of yacc.c */
--#line 7500 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7500 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 1051:
-
--/* Line 1455 of yacc.c */
--#line 7504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7504 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1052:
-
--/* Line 1455 of yacc.c */
--#line 7505 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7505 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1053:
-
--/* Line 1455 of yacc.c */
--#line 7511 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7511 "sql/sql_yacc.yy"
- {
- /*
- Design notes:
-@@ -25348,8 +25378,8 @@
-
- case 1054:
-
--/* Line 1455 of yacc.c */
--#line 7562 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7562 "sql/sql_yacc.yy"
- {
- /* XOR is a proprietary extension */
- (yyval.item) = new (YYTHD->mem_root) Item_cond_xor((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
-@@ -25360,8 +25390,8 @@
-
- case 1055:
-
--/* Line 1455 of yacc.c */
--#line 7569 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7569 "sql/sql_yacc.yy"
- {
- /* See comments in rule expr: expr or expr */
- Item_cond_and *item1;
-@@ -25408,8 +25438,8 @@
-
- case 1056:
-
--/* Line 1455 of yacc.c */
--#line 7612 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7612 "sql/sql_yacc.yy"
- {
- (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
- if ((yyval.item) == NULL)
-@@ -25419,8 +25449,8 @@
-
- case 1057:
-
--/* Line 1455 of yacc.c */
--#line 7618 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7618 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item));
- if ((yyval.item) == NULL)
-@@ -25430,8 +25460,8 @@
-
- case 1058:
-
--/* Line 1455 of yacc.c */
--#line 7624 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7624 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -25441,8 +25471,8 @@
-
- case 1059:
-
--/* Line 1455 of yacc.c */
--#line 7630 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7630 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item));
- if ((yyval.item) == NULL)
-@@ -25452,8 +25482,8 @@
-
- case 1060:
-
--/* Line 1455 of yacc.c */
--#line 7636 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7636 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -25463,8 +25493,8 @@
-
- case 1061:
-
--/* Line 1455 of yacc.c */
--#line 7642 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7642 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
- if ((yyval.item) == NULL)
-@@ -25474,8 +25504,8 @@
-
- case 1062:
-
--/* Line 1455 of yacc.c */
--#line 7648 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7648 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -25485,8 +25515,8 @@
-
- case 1064:
-
--/* Line 1455 of yacc.c */
--#line 7658 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7658 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
- if ((yyval.item) == NULL)
-@@ -25496,8 +25526,8 @@
-
- case 1065:
-
--/* Line 1455 of yacc.c */
--#line 7664 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7664 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -25507,8 +25537,8 @@
-
- case 1066:
-
--/* Line 1455 of yacc.c */
--#line 7670 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7670 "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)
-@@ -25518,8 +25548,8 @@
-
- case 1067:
-
--/* Line 1455 of yacc.c */
--#line 7676 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7676 "sql/sql_yacc.yy"
- {
- (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
- if ((yyval.item) == NULL)
-@@ -25529,8 +25559,8 @@
-
- case 1068:
-
--/* Line 1455 of yacc.c */
--#line 7682 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7682 "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)
-@@ -25540,8 +25570,8 @@
-
- case 1070:
-
--/* Line 1455 of yacc.c */
--#line 7692 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7692 "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)
-@@ -25551,8 +25581,8 @@
-
- case 1071:
-
--/* Line 1455 of yacc.c */
--#line 7698 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7698 "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));
-@@ -25566,8 +25596,8 @@
-
- case 1072:
-
--/* Line 1455 of yacc.c */
--#line 7708 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7708 "sql/sql_yacc.yy"
- {
- (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (5)].item), true, (yyvsp[(4) - (5)].item));
- if ((yyval.item) == NULL)
-@@ -25577,8 +25607,8 @@
-
- case 1073:
-
--/* Line 1455 of yacc.c */
--#line 7714 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7714 "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));
-@@ -25590,8 +25620,8 @@
-
- case 1074:
-
--/* Line 1455 of yacc.c */
--#line 7722 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7722 "sql/sql_yacc.yy"
- {
- (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (6)].item), false, (yyvsp[(5) - (6)].item));
- if ((yyval.item) == NULL)
-@@ -25601,8 +25631,8 @@
-
- case 1075:
-
--/* Line 1455 of yacc.c */
--#line 7728 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7728 "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));
-@@ -25616,8 +25646,8 @@
-
- case 1076:
-
--/* Line 1455 of yacc.c */
--#line 7738 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7738 "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)
-@@ -25627,8 +25657,8 @@
-
- case 1077:
-
--/* Line 1455 of yacc.c */
--#line 7744 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7744 "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));
-@@ -25641,8 +25671,8 @@
-
- case 1078:
-
--/* Line 1455 of yacc.c */
--#line 7753 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7753 "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));
-@@ -25656,8 +25686,8 @@
-
- case 1079:
-
--/* Line 1455 of yacc.c */
--#line 7763 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7763 "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)
-@@ -25667,8 +25697,8 @@
-
- case 1080:
-
--/* Line 1455 of yacc.c */
--#line 7769 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7769 "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);
-@@ -25682,8 +25712,8 @@
-
- case 1081:
-
--/* Line 1455 of yacc.c */
--#line 7779 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7779 "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)
-@@ -25693,8 +25723,8 @@
-
- case 1082:
-
--/* Line 1455 of yacc.c */
--#line 7785 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7785 "sql/sql_yacc.yy"
- {
- Item *item= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (4)].item),(yyvsp[(4) - (4)].item));
- if (item == NULL)
-@@ -25707,8 +25737,8 @@
-
- case 1084:
-
--/* Line 1455 of yacc.c */
--#line 7798 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7798 "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)
-@@ -25718,8 +25748,8 @@
-
- case 1085:
-
--/* Line 1455 of yacc.c */
--#line 7804 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7804 "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)
-@@ -25729,8 +25759,8 @@
-
- case 1086:
-
--/* Line 1455 of yacc.c */
--#line 7810 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7810 "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)
-@@ -25740,8 +25770,8 @@
-
- case 1087:
-
--/* Line 1455 of yacc.c */
--#line 7816 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7816 "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)
-@@ -25751,8 +25781,8 @@
-
- case 1088:
-
--/* Line 1455 of yacc.c */
--#line 7822 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7822 "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)
-@@ -25762,8 +25792,8 @@
-
- case 1089:
-
--/* Line 1455 of yacc.c */
--#line 7828 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7828 "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)
-@@ -25773,8 +25803,8 @@
-
- case 1090:
-
--/* Line 1455 of yacc.c */
--#line 7834 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7834 "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)
-@@ -25784,8 +25814,8 @@
-
- case 1091:
-
--/* Line 1455 of yacc.c */
--#line 7840 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7840 "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)
-@@ -25795,8 +25825,8 @@
-
- case 1092:
-
--/* Line 1455 of yacc.c */
--#line 7846 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7846 "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)
-@@ -25806,8 +25836,8 @@
-
- case 1093:
-
--/* Line 1455 of yacc.c */
--#line 7852 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7852 "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)
-@@ -25817,8 +25847,8 @@
-
- case 1094:
-
--/* Line 1455 of yacc.c */
--#line 7858 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7858 "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)
-@@ -25828,8 +25858,8 @@
-
- case 1095:
-
--/* Line 1455 of yacc.c */
--#line 7864 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7864 "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)
-@@ -25839,8 +25869,8 @@
-
- case 1096:
-
--/* Line 1455 of yacc.c */
--#line 7870 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7870 "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)
-@@ -25850,8 +25880,8 @@
-
- case 1097:
-
--/* Line 1455 of yacc.c */
--#line 7876 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7876 "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)
-@@ -25861,64 +25891,64 @@
-
- case 1107:
-
--/* Line 1455 of yacc.c */
--#line 7905 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7905 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_eq_creator; }
- break;
-
- case 1108:
-
--/* Line 1455 of yacc.c */
--#line 7906 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7906 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_ge_creator; }
- break;
-
- case 1109:
-
--/* Line 1455 of yacc.c */
--#line 7907 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7907 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_gt_creator; }
- break;
-
- case 1110:
-
--/* Line 1455 of yacc.c */
--#line 7908 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7908 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_le_creator; }
- break;
-
- case 1111:
-
--/* Line 1455 of yacc.c */
--#line 7909 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7909 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_lt_creator; }
- break;
-
- case 1112:
-
--/* Line 1455 of yacc.c */
--#line 7910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7910 "sql/sql_yacc.yy"
- { (yyval.boolfunc2creator) = &comp_ne_creator; }
- break;
-
- case 1113:
-
--/* Line 1455 of yacc.c */
--#line 7914 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7914 "sql/sql_yacc.yy"
- { (yyval.num) = 1; }
- break;
-
- case 1114:
-
--/* Line 1455 of yacc.c */
--#line 7915 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7915 "sql/sql_yacc.yy"
- { (yyval.num) = 0; }
- break;
-
- case 1120:
-
--/* Line 1455 of yacc.c */
--#line 7925 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7925 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Item *i1= new (thd->mem_root) Item_string((yyvsp[(3) - (3)].lex_str).str,
-@@ -25934,8 +25964,8 @@
-
- case 1125:
-
--/* Line 1455 of yacc.c */
--#line 7941 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7941 "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)
-@@ -25945,8 +25975,8 @@
-
- case 1126:
-
--/* Line 1455 of yacc.c */
--#line 7947 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7947 "sql/sql_yacc.yy"
- {
- (yyval.item)= (yyvsp[(2) - (2)].item);
- }
-@@ -25954,8 +25984,8 @@
-
- case 1127:
-
--/* Line 1455 of yacc.c */
--#line 7951 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7951 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_neg((yyvsp[(2) - (2)].item));
- if ((yyval.item) == NULL)
-@@ -25965,8 +25995,8 @@
-
- case 1128:
-
--/* Line 1455 of yacc.c */
--#line 7957 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7957 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_bit_neg((yyvsp[(2) - (2)].item));
- if ((yyval.item) == NULL)
-@@ -25976,8 +26006,8 @@
-
- case 1129:
-
--/* Line 1455 of yacc.c */
--#line 7963 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7963 "sql/sql_yacc.yy"
- {
- (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
- if ((yyval.item) == NULL)
-@@ -25987,8 +26017,8 @@
-
- case 1130:
-
--/* Line 1455 of yacc.c */
--#line 7969 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7969 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_singlerow_subselect((yyvsp[(2) - (3)].select_lex));
- if ((yyval.item) == NULL)
-@@ -25998,15 +26028,15 @@
-
- case 1131:
-
--/* Line 1455 of yacc.c */
--#line 7975 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7975 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(2) - (3)].item); }
- break;
-
- case 1132:
-
--/* Line 1455 of yacc.c */
--#line 7977 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7977 "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));
-@@ -26017,8 +26047,8 @@
-
- case 1133:
-
--/* Line 1455 of yacc.c */
--#line 7984 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7984 "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));
-@@ -26029,8 +26059,8 @@
-
- case 1134:
-
--/* Line 1455 of yacc.c */
--#line 7991 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7991 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_exists_subselect((yyvsp[(3) - (4)].select_lex));
- if ((yyval.item) == NULL)
-@@ -26040,15 +26070,15 @@
-
- case 1135:
-
--/* Line 1455 of yacc.c */
--#line 7997 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7997 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(3) - (4)].item); }
- break;
-
- case 1136:
-
--/* Line 1455 of yacc.c */
--#line 7999 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 7999 "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));
-@@ -26061,8 +26091,8 @@
-
- case 1137:
-
--/* Line 1455 of yacc.c */
--#line 8008 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8008 "sql/sql_yacc.yy"
- {
- (yyval.item)= create_func_cast(YYTHD, (yyvsp[(2) - (2)].item), ITEM_CAST_CHAR, NULL, NULL,
- &my_charset_bin);
-@@ -26073,8 +26103,8 @@
-
- case 1138:
-
--/* Line 1455 of yacc.c */
--#line 8015 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8015 "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,
-@@ -26086,8 +26116,8 @@
-
- case 1139:
-
--/* Line 1455 of yacc.c */
--#line 8023 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8023 "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)
-@@ -26097,8 +26127,8 @@
-
- case 1140:
-
--/* Line 1455 of yacc.c */
--#line 8029 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8029 "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);
-@@ -26109,8 +26139,8 @@
-
- case 1141:
-
--/* Line 1455 of yacc.c */
--#line 8036 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8036 "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)
-@@ -26120,8 +26150,8 @@
-
- case 1142:
-
--/* Line 1455 of yacc.c */
--#line 8042 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8042 "sql/sql_yacc.yy"
- {
- if ((yyvsp[(3) - (4)].item)->is_splocal())
- {
-@@ -26139,8 +26169,8 @@
-
- case 1143:
-
--/* Line 1455 of yacc.c */
--#line 8056 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8056 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
- (yyvsp[(3) - (4)].item));
-@@ -26151,8 +26181,8 @@
-
- case 1144:
-
--/* Line 1455 of yacc.c */
--#line 8064 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8064 "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)
-@@ -26162,8 +26192,8 @@
-
- case 1145:
-
--/* Line 1455 of yacc.c */
--#line 8079 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8079 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (4)].item_list));
- if ((yyval.item) == NULL)
-@@ -26173,8 +26203,8 @@
-
- case 1146:
-
--/* Line 1455 of yacc.c */
--#line 8085 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8085 "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)
-@@ -26184,8 +26214,8 @@
-
- case 1147:
-
--/* Line 1455 of yacc.c */
--#line 8091 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8091 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
- if ((yyval.item) == NULL)
-@@ -26197,8 +26227,8 @@
-
- case 1148:
-
--/* Line 1455 of yacc.c */
--#line 8099 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8099 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_date_typecast((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26208,8 +26238,8 @@
-
- case 1149:
-
--/* Line 1455 of yacc.c */
--#line 8105 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8105 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_dayofmonth((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26219,8 +26249,8 @@
-
- case 1150:
-
--/* Line 1455 of yacc.c */
--#line 8111 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8111 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_hour((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26230,8 +26260,8 @@
-
- case 1151:
-
--/* Line 1455 of yacc.c */
--#line 8117 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8117 "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)
-@@ -26241,8 +26271,8 @@
-
- case 1152:
-
--/* Line 1455 of yacc.c */
--#line 8123 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8123 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- List<Item> *list= new (thd->mem_root) List<Item>;
-@@ -26261,8 +26291,8 @@
-
- case 1153:
-
--/* Line 1455 of yacc.c */
--#line 8138 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8138 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
-@@ -26278,8 +26308,8 @@
-
- case 1154:
-
--/* Line 1455 of yacc.c */
--#line 8150 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8150 "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)
-@@ -26289,8 +26319,8 @@
-
- case 1155:
-
--/* Line 1455 of yacc.c */
--#line 8156 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8156 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_minute((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26300,8 +26330,8 @@
-
- case 1156:
-
--/* Line 1455 of yacc.c */
--#line 8162 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8162 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_month((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26311,8 +26341,8 @@
-
- case 1157:
-
--/* Line 1455 of yacc.c */
--#line 8168 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8168 "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)
-@@ -26322,8 +26352,8 @@
-
- case 1158:
-
--/* Line 1455 of yacc.c */
--#line 8174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8174 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_second((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26333,8 +26363,8 @@
-
- case 1159:
-
--/* Line 1455 of yacc.c */
--#line 8180 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8180 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26344,8 +26374,8 @@
-
- case 1160:
-
--/* Line 1455 of yacc.c */
--#line 8186 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8186 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26355,8 +26385,8 @@
-
- case 1161:
-
--/* Line 1455 of yacc.c */
--#line 8192 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8192 "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)
-@@ -26366,8 +26396,8 @@
-
- case 1162:
-
--/* Line 1455 of yacc.c */
--#line 8198 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8198 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26377,8 +26407,8 @@
-
- case 1163:
-
--/* Line 1455 of yacc.c */
--#line 8204 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8204 "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)
-@@ -26388,8 +26418,8 @@
-
- case 1164:
-
--/* Line 1455 of yacc.c */
--#line 8210 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8210 "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)
-@@ -26399,8 +26429,8 @@
-
- case 1165:
-
--/* Line 1455 of yacc.c */
--#line 8216 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8216 "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)
-@@ -26410,8 +26440,8 @@
-
- case 1166:
-
--/* Line 1455 of yacc.c */
--#line 8222 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8222 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item));
- if ((yyval.item) == NULL)
-@@ -26421,8 +26451,8 @@
-
- case 1167:
-
--/* Line 1455 of yacc.c */
--#line 8228 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8228 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item));
- if ((yyval.item) == NULL)
-@@ -26432,8 +26462,8 @@
-
- case 1168:
-
--/* Line 1455 of yacc.c */
--#line 8234 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8234 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item));
- if ((yyval.item) == NULL)
-@@ -26443,8 +26473,8 @@
-
- case 1169:
-
--/* Line 1455 of yacc.c */
--#line 8240 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8240 "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)
-@@ -26454,8 +26484,8 @@
-
- case 1170:
-
--/* Line 1455 of yacc.c */
--#line 8246 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8246 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_user();
- if ((yyval.item) == NULL)
-@@ -26467,8 +26497,8 @@
-
- case 1171:
-
--/* Line 1455 of yacc.c */
--#line 8254 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8254 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_year((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26478,8 +26508,8 @@
-
- case 1172:
-
--/* Line 1455 of yacc.c */
--#line 8275 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8275 "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);
-@@ -26490,8 +26520,8 @@
-
- case 1173:
-
--/* Line 1455 of yacc.c */
--#line 8282 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8282 "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)
-@@ -26501,8 +26531,8 @@
-
- case 1174:
-
--/* Line 1455 of yacc.c */
--#line 8288 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8288 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_local();
- if ((yyval.item) == NULL)
-@@ -26513,8 +26543,8 @@
-
- case 1175:
-
--/* Line 1455 of yacc.c */
--#line 8295 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8295 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local();
- if ((yyval.item) == NULL)
-@@ -26525,8 +26555,8 @@
-
- case 1176:
-
--/* Line 1455 of yacc.c */
--#line 8302 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8302 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26537,8 +26567,8 @@
-
- case 1177:
-
--/* Line 1455 of yacc.c */
--#line 8310 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8310 "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)
-@@ -26548,8 +26578,8 @@
-
- case 1178:
-
--/* Line 1455 of yacc.c */
--#line 8317 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8317 "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)
-@@ -26559,8 +26589,8 @@
-
- case 1179:
-
--/* Line 1455 of yacc.c */
--#line 8323 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8323 "sql/sql_yacc.yy"
- {
- (yyval.item)=new (YYTHD->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item));
- if ((yyval.item) == NULL)
-@@ -26570,8 +26600,8 @@
-
- case 1180:
-
--/* Line 1455 of yacc.c */
--#line 8329 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8329 "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)
-@@ -26581,8 +26611,8 @@
-
- case 1181:
-
--/* Line 1455 of yacc.c */
--#line 8335 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8335 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_now_local();
- if ((yyval.item) == NULL)
-@@ -26593,8 +26623,8 @@
-
- case 1182:
-
--/* Line 1455 of yacc.c */
--#line 8342 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8342 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_now_local((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26605,8 +26635,8 @@
-
- case 1183:
-
--/* Line 1455 of yacc.c */
--#line 8349 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8349 "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)
-@@ -26616,8 +26646,8 @@
-
- case 1184:
-
--/* Line 1455 of yacc.c */
--#line 8355 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8355 "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);
-@@ -26628,8 +26658,8 @@
-
- case 1185:
-
--/* Line 1455 of yacc.c */
--#line 8362 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8362 "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)
-@@ -26639,8 +26669,8 @@
-
- case 1186:
-
--/* Line 1455 of yacc.c */
--#line 8368 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8368 "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)
-@@ -26650,8 +26680,8 @@
-
- case 1187:
-
--/* Line 1455 of yacc.c */
--#line 8374 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8374 "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)
-@@ -26661,8 +26691,8 @@
-
- case 1188:
-
--/* Line 1455 of yacc.c */
--#line 8380 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8380 "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)
-@@ -26672,8 +26702,8 @@
-
- case 1189:
-
--/* Line 1455 of yacc.c */
--#line 8386 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8386 "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)
-@@ -26683,8 +26713,8 @@
-
- case 1190:
-
--/* Line 1455 of yacc.c */
--#line 8392 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8392 "sql/sql_yacc.yy"
- {
- /*
- Unlike other time-related functions, SYSDATE() is
-@@ -26706,8 +26736,8 @@
-
- case 1191:
-
--/* Line 1455 of yacc.c */
--#line 8410 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8410 "sql/sql_yacc.yy"
- {
- if (global_system_variables.sysdate_is_now == 0)
- (yyval.item)= new (YYTHD->mem_root) Item_func_sysdate_local((yyvsp[(3) - (4)].item));
-@@ -26721,8 +26751,8 @@
-
- case 1192:
-
--/* Line 1455 of yacc.c */
--#line 8420 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8420 "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)
-@@ -26732,8 +26762,8 @@
-
- case 1193:
-
--/* Line 1455 of yacc.c */
--#line 8426 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8426 "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)
-@@ -26743,8 +26773,8 @@
-
- case 1194:
-
--/* Line 1455 of yacc.c */
--#line 8432 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8432 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_utc();
- if ((yyval.item) == NULL)
-@@ -26755,8 +26785,8 @@
-
- case 1195:
-
--/* Line 1455 of yacc.c */
--#line 8439 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8439 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_utc();
- if ((yyval.item) == NULL)
-@@ -26767,8 +26797,8 @@
-
- case 1196:
-
--/* Line 1455 of yacc.c */
--#line 8446 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8446 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_now_utc();
- if ((yyval.item) == NULL)
-@@ -26779,8 +26809,8 @@
-
- case 1197:
-
--/* Line 1455 of yacc.c */
--#line 8461 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8461 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_ascii((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26790,8 +26820,8 @@
-
- case 1198:
-
--/* Line 1455 of yacc.c */
--#line 8467 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8467 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_charset((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26801,8 +26831,8 @@
-
- case 1199:
-
--/* Line 1455 of yacc.c */
--#line 8473 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8473 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list));
- if ((yyval.item) == NULL)
-@@ -26812,8 +26842,8 @@
-
- case 1200:
-
--/* Line 1455 of yacc.c */
--#line 8479 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8479 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_collation((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26823,8 +26853,8 @@
-
- case 1201:
-
--/* Line 1455 of yacc.c */
--#line 8485 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8485 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_database();
- if ((yyval.item) == NULL)
-@@ -26835,8 +26865,8 @@
-
- case 1202:
-
--/* Line 1455 of yacc.c */
--#line 8492 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8492 "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)
-@@ -26846,8 +26876,8 @@
-
- case 1203:
-
--/* Line 1455 of yacc.c */
--#line 8498 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8498 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26857,8 +26887,8 @@
-
- case 1204:
-
--/* Line 1455 of yacc.c */
--#line 8504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8504 "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)
-@@ -26868,8 +26898,8 @@
-
- case 1205:
-
--/* Line 1455 of yacc.c */
--#line 8510 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8510 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26879,8 +26909,8 @@
-
- case 1206:
-
--/* Line 1455 of yacc.c */
--#line 8516 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8516 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Item* i1;
-@@ -26896,8 +26926,8 @@
-
- case 1207:
-
--/* Line 1455 of yacc.c */
--#line 8528 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8528 "sql/sql_yacc.yy"
- {
- (yyval.item) = new (YYTHD->mem_root) Item_func_quarter((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -26907,8 +26937,8 @@
-
- case 1208:
-
--/* Line 1455 of yacc.c */
--#line 8534 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8534 "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)
-@@ -26918,8 +26948,8 @@
-
- case 1209:
-
--/* Line 1455 of yacc.c */
--#line 8540 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8540 "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)
-@@ -26929,8 +26959,8 @@
-
- case 1210:
-
--/* Line 1455 of yacc.c */
--#line 8546 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8546 "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)
-@@ -26940,8 +26970,8 @@
-
- case 1211:
-
--/* Line 1455 of yacc.c */
--#line 8552 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8552 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Item *i1= new (thd->mem_root) Item_int((char*) "0",
-@@ -26957,8 +26987,8 @@
-
- case 1212:
-
--/* Line 1455 of yacc.c */
--#line 8564 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8564 "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)
-@@ -26968,8 +26998,8 @@
-
- case 1213:
-
--/* Line 1455 of yacc.c */
--#line 8570 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8570 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_SPATIAL
- (yyval.item)= (yyvsp[(1) - (1)].item);
-@@ -26986,8 +27016,8 @@
-
- case 1214:
-
--/* Line 1455 of yacc.c */
--#line 8586 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8586 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_rel((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
-@@ -26997,8 +27027,8 @@
-
- case 1215:
-
--/* Line 1455 of yacc.c */
--#line 8592 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8592 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27009,8 +27039,8 @@
-
- case 1216:
-
--/* Line 1455 of yacc.c */
--#line 8599 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8599 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27021,8 +27051,8 @@
-
- case 1217:
-
--/* Line 1455 of yacc.c */
--#line 8606 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8606 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27033,8 +27063,8 @@
-
- case 1218:
-
--/* Line 1455 of yacc.c */
--#line 8613 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8613 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27045,8 +27075,8 @@
-
- case 1219:
-
--/* Line 1455 of yacc.c */
--#line 8620 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8620 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27057,8 +27087,8 @@
-
- case 1220:
-
--/* Line 1455 of yacc.c */
--#line 8627 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8627 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD, Item_func_point((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)));
- }
-@@ -27066,8 +27096,8 @@
-
- case 1221:
-
--/* Line 1455 of yacc.c */
--#line 8631 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8631 "sql/sql_yacc.yy"
- {
- (yyval.item)= GEOM_NEW(YYTHD,
- Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
-@@ -27078,8 +27108,8 @@
-
- case 1222:
-
--/* Line 1455 of yacc.c */
--#line 8650 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8650 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_DLOPEN
- udf_func *udf= 0;
-@@ -27102,8 +27132,8 @@
-
- case 1223:
-
--/* Line 1455 of yacc.c */
--#line 8669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8669 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Create_func *builder;
-@@ -27161,8 +27191,8 @@
-
- case 1224:
-
--/* Line 1455 of yacc.c */
--#line 8723 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8723 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Create_qfunc *builder;
-@@ -27205,64 +27235,64 @@
-
- case 1225:
-
--/* Line 1455 of yacc.c */
--#line 8765 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8765 "sql/sql_yacc.yy"
- { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
- break;
-
- case 1226:
-
--/* Line 1455 of yacc.c */
--#line 8767 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8767 "sql/sql_yacc.yy"
- { (yyval.num)= FT_BOOL; }
- break;
-
- case 1227:
-
--/* Line 1455 of yacc.c */
--#line 8771 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8771 "sql/sql_yacc.yy"
- { (yyval.num)= FT_NL; }
- break;
-
- case 1228:
-
--/* Line 1455 of yacc.c */
--#line 8772 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8772 "sql/sql_yacc.yy"
- { (yyval.num)= FT_NL; }
- break;
-
- case 1229:
-
--/* Line 1455 of yacc.c */
--#line 8776 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8776 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 1230:
-
--/* Line 1455 of yacc.c */
--#line 8777 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8777 "sql/sql_yacc.yy"
- { (yyval.num)= FT_EXPAND; }
- break;
-
- case 1231:
-
--/* Line 1455 of yacc.c */
--#line 8781 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8781 "sql/sql_yacc.yy"
- { (yyval.item_list)= NULL; }
- break;
-
- case 1232:
-
--/* Line 1455 of yacc.c */
--#line 8782 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8782 "sql/sql_yacc.yy"
- { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
- break;
-
- case 1233:
-
--/* Line 1455 of yacc.c */
--#line 8787 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8787 "sql/sql_yacc.yy"
- {
- (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
- if ((yyval.item_list) == NULL)
-@@ -27273,8 +27303,8 @@
-
- case 1234:
-
--/* Line 1455 of yacc.c */
--#line 8794 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8794 "sql/sql_yacc.yy"
- {
- (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
- (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
-@@ -27283,8 +27313,8 @@
-
- case 1235:
-
--/* Line 1455 of yacc.c */
--#line 8802 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8802 "sql/sql_yacc.yy"
- {
- /*
- Use Item::name as a storage for the attribute value of user
-@@ -27311,8 +27341,8 @@
-
- case 1236:
-
--/* Line 1455 of yacc.c */
--#line 8828 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8828 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(3) - (4)].item), FALSE);
- if ((yyval.item) == NULL)
-@@ -27322,8 +27352,8 @@
-
- case 1237:
-
--/* Line 1455 of yacc.c */
--#line 8834 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8834 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(4) - (5)].item), TRUE);
- if ((yyval.item) == NULL)
-@@ -27333,8 +27363,8 @@
-
- case 1238:
-
--/* Line 1455 of yacc.c */
--#line 8840 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8840 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_and((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27344,8 +27374,8 @@
-
- case 1239:
-
--/* Line 1455 of yacc.c */
--#line 8846 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8846 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_or((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27355,8 +27385,8 @@
-
- case 1240:
-
--/* Line 1455 of yacc.c */
--#line 8852 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8852 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_xor((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27366,8 +27396,8 @@
-
- case 1241:
-
--/* Line 1455 of yacc.c */
--#line 8858 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8858 "sql/sql_yacc.yy"
- {
- Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1);
- if (item == NULL)
-@@ -27380,8 +27410,8 @@
-
- case 1242:
-
--/* Line 1455 of yacc.c */
--#line 8867 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8867 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_count((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27391,22 +27421,22 @@
-
- case 1243:
-
--/* Line 1455 of yacc.c */
--#line 8873 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8873 "sql/sql_yacc.yy"
- { Select->in_sum_expr++; }
- break;
-
- case 1244:
-
--/* Line 1455 of yacc.c */
--#line 8875 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8875 "sql/sql_yacc.yy"
- { Select->in_sum_expr--; }
- break;
-
- case 1245:
-
--/* Line 1455 of yacc.c */
--#line 8877 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8877 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_count(* (yyvsp[(5) - (7)].item_list));
- if ((yyval.item) == NULL)
-@@ -27416,8 +27446,8 @@
-
- case 1246:
-
--/* Line 1455 of yacc.c */
--#line 8883 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8883 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27427,8 +27457,8 @@
-
- case 1247:
-
--/* Line 1455 of yacc.c */
--#line 8894 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8894 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(4) - (5)].item));
- if ((yyval.item) == NULL)
-@@ -27438,8 +27468,8 @@
-
- case 1248:
-
--/* Line 1455 of yacc.c */
--#line 8900 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8900 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(3) - (4)].item));
- if ((yyval.item) == NULL)
-@@ -27449,8 +27479,8 @@
-
- case 1249:
-
--/* Line 1455 of yacc.c */
--#line 8906 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8906 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(4) - (5)].item));
- if ((yyval.item) == NULL)
-@@ -27460,8 +27490,8 @@
-
- case 1250:
-
--/* Line 1455 of yacc.c */
--#line 8912 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8912 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0);
- if ((yyval.item) == NULL)
-@@ -27471,8 +27501,8 @@
-
- case 1251:
-
--/* Line 1455 of yacc.c */
--#line 8918 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8918 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0);
- if ((yyval.item) == NULL)
-@@ -27482,8 +27512,8 @@
-
- case 1252:
-
--/* Line 1455 of yacc.c */
--#line 8924 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8924 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1);
- if ((yyval.item) == NULL)
-@@ -27493,8 +27523,8 @@
-
- case 1253:
-
--/* Line 1455 of yacc.c */
--#line 8930 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8930 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1);
- if ((yyval.item) == NULL)
-@@ -27504,8 +27534,8 @@
-
- case 1254:
-
--/* Line 1455 of yacc.c */
--#line 8936 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8936 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE);
- if ((yyval.item) == NULL)
-@@ -27515,8 +27545,8 @@
-
- case 1255:
-
--/* Line 1455 of yacc.c */
--#line 8942 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8942 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(4) - (5)].item), TRUE);
- if ((yyval.item) == NULL)
-@@ -27526,15 +27556,15 @@
-
- case 1256:
-
--/* Line 1455 of yacc.c */
--#line 8948 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8948 "sql/sql_yacc.yy"
- { Select->in_sum_expr++; }
- break;
-
- case 1257:
-
--/* Line 1455 of yacc.c */
--#line 8952 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8952 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->in_sum_expr--;
-@@ -27549,8 +27579,8 @@
-
- case 1258:
-
--/* Line 1455 of yacc.c */
--#line 8966 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8966 "sql/sql_yacc.yy"
- {
- if (! Lex->parsing_options.allows_variable)
- {
-@@ -27562,8 +27592,8 @@
-
- case 1259:
-
--/* Line 1455 of yacc.c */
--#line 8974 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8974 "sql/sql_yacc.yy"
- {
- (yyval.item)= (yyvsp[(3) - (3)].item);
- }
-@@ -27571,8 +27601,8 @@
-
- case 1260:
-
--/* Line 1455 of yacc.c */
--#line 8981 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8981 "sql/sql_yacc.yy"
- {
- Item_func_set_user_var *item;
- (yyval.item)= item= new (YYTHD->mem_root) Item_func_set_user_var((yyvsp[(1) - (3)].lex_str), (yyvsp[(3) - (3)].item), false);
-@@ -27586,8 +27616,8 @@
-
- case 1261:
-
--/* Line 1455 of yacc.c */
--#line 8991 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8991 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(1) - (1)].lex_str));
- if ((yyval.item) == NULL)
-@@ -27599,8 +27629,8 @@
-
- case 1262:
-
--/* Line 1455 of yacc.c */
--#line 8999 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 8999 "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)))
-@@ -27617,22 +27647,22 @@
-
- case 1263:
-
--/* Line 1455 of yacc.c */
--#line 9014 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9014 "sql/sql_yacc.yy"
- { (yyval.num) = 0; }
- break;
-
- case 1264:
-
--/* Line 1455 of yacc.c */
--#line 9015 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9015 "sql/sql_yacc.yy"
- { (yyval.num) = 1; }
- break;
-
- case 1265:
-
--/* Line 1455 of yacc.c */
--#line 9020 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9020 "sql/sql_yacc.yy"
- {
- (yyval.string)= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
- if ((yyval.string) == NULL)
-@@ -27642,15 +27672,15 @@
-
- case 1266:
-
--/* Line 1455 of yacc.c */
--#line 9025 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9025 "sql/sql_yacc.yy"
- { (yyval.string) = (yyvsp[(2) - (2)].string); }
- break;
-
- case 1267:
-
--/* Line 1455 of yacc.c */
--#line 9030 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9030 "sql/sql_yacc.yy"
- {
- Select->gorder_list = NULL;
- }
-@@ -27658,8 +27688,8 @@
-
- case 1268:
-
--/* Line 1455 of yacc.c */
--#line 9034 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9034 "sql/sql_yacc.yy"
- {
- SELECT_LEX *select= Select;
- select->gorder_list= new (YYTHD->mem_root)
-@@ -27672,8 +27702,8 @@
-
- case 1269:
-
--/* Line 1455 of yacc.c */
--#line 9046 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9046 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->current_select->inc_in_sum_expr())
-@@ -27686,8 +27716,8 @@
-
- case 1270:
-
--/* Line 1455 of yacc.c */
--#line 9055 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9055 "sql/sql_yacc.yy"
- {
- Select->in_sum_expr--;
- (yyval.item)= (yyvsp[(3) - (3)].item);
-@@ -27696,99 +27726,99 @@
-
- case 1271:
-
--/* Line 1455 of yacc.c */
--#line 9063 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9063 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
- break;
-
- case 1272:
-
--/* Line 1455 of yacc.c */
--#line 9065 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9065 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
- break;
-
- case 1273:
-
--/* Line 1455 of yacc.c */
--#line 9067 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9067 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
- break;
-
- case 1274:
-
--/* Line 1455 of yacc.c */
--#line 9069 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9069 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1275:
-
--/* Line 1455 of yacc.c */
--#line 9071 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9071 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1276:
-
--/* Line 1455 of yacc.c */
--#line 9073 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9073 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1277:
-
--/* Line 1455 of yacc.c */
--#line 9075 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9075 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1278:
-
--/* Line 1455 of yacc.c */
--#line 9077 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9077 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1279:
-
--/* Line 1455 of yacc.c */
--#line 9079 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9079 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_TIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1280:
-
--/* Line 1455 of yacc.c */
--#line 9081 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9081 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_DATETIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
- break;
-
- case 1281:
-
--/* Line 1455 of yacc.c */
--#line 9083 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9083 "sql/sql_yacc.yy"
- { (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
- break;
-
- case 1282:
-
--/* Line 1455 of yacc.c */
--#line 9087 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9087 "sql/sql_yacc.yy"
- { (yyval.item_list)= NULL; }
- break;
-
- case 1283:
-
--/* Line 1455 of yacc.c */
--#line 9088 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9088 "sql/sql_yacc.yy"
- { (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
- break;
-
- case 1284:
-
--/* Line 1455 of yacc.c */
--#line 9093 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9093 "sql/sql_yacc.yy"
- {
- (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
- if ((yyval.item_list) == NULL)
-@@ -27799,8 +27829,8 @@
-
- case 1285:
-
--/* Line 1455 of yacc.c */
--#line 9100 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9100 "sql/sql_yacc.yy"
- {
- (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
- (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
-@@ -27809,22 +27839,22 @@
-
- case 1286:
-
--/* Line 1455 of yacc.c */
--#line 9107 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9107 "sql/sql_yacc.yy"
- { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
- break;
-
- case 1287:
-
--/* Line 1455 of yacc.c */
--#line 9108 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9108 "sql/sql_yacc.yy"
- { (yyval.item_list)= (yyvsp[(2) - (3)].item_list); }
- break;
-
- case 1288:
-
--/* Line 1455 of yacc.c */
--#line 9113 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9113 "sql/sql_yacc.yy"
- {
- (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
- if ((yyval.item_list) == NULL)
-@@ -27835,8 +27865,8 @@
-
- case 1289:
-
--/* Line 1455 of yacc.c */
--#line 9120 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9120 "sql/sql_yacc.yy"
- {
- (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
- (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
-@@ -27845,36 +27875,36 @@
-
- case 1290:
-
--/* Line 1455 of yacc.c */
--#line 9127 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9127 "sql/sql_yacc.yy"
- { (yyval.item)= NULL; }
- break;
-
- case 1291:
-
--/* Line 1455 of yacc.c */
--#line 9128 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9128 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item); }
- break;
-
- case 1292:
-
--/* Line 1455 of yacc.c */
--#line 9132 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9132 "sql/sql_yacc.yy"
- { (yyval.item)= NULL; }
- break;
-
- case 1293:
-
--/* Line 1455 of yacc.c */
--#line 9133 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9133 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(2) - (2)].item); }
- break;
-
- case 1294:
-
--/* Line 1455 of yacc.c */
--#line 9138 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9138 "sql/sql_yacc.yy"
- {
- (yyval.item_list)= new List<Item>;
- if ((yyval.item_list) == NULL)
-@@ -27886,8 +27916,8 @@
-
- case 1295:
-
--/* Line 1455 of yacc.c */
--#line 9146 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9146 "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));
-@@ -27897,15 +27927,15 @@
-
- case 1296:
-
--/* Line 1455 of yacc.c */
--#line 9156 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9156 "sql/sql_yacc.yy"
- { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
- break;
-
- case 1297:
-
--/* Line 1455 of yacc.c */
--#line 9158 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9158 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd)))
-@@ -27915,36 +27945,36 @@
-
- case 1298:
-
--/* Line 1455 of yacc.c */
--#line 9166 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9166 "sql/sql_yacc.yy"
- { MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); }
- break;
-
- case 1299:
-
--/* Line 1455 of yacc.c */
--#line 9177 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9177 "sql/sql_yacc.yy"
- { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
- break;
-
- case 1300:
-
--/* Line 1455 of yacc.c */
--#line 9178 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9178 "sql/sql_yacc.yy"
- { (yyval.table_list)=(yyvsp[(3) - (4)].table_list); }
- break;
-
- case 1301:
-
--/* Line 1455 of yacc.c */
--#line 9184 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9184 "sql/sql_yacc.yy"
- { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
- break;
-
- case 1302:
-
--/* Line 1455 of yacc.c */
--#line 9186 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9186 "sql/sql_yacc.yy"
- {
- MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list)));
- }
-@@ -27952,22 +27982,22 @@
-
- case 1303:
-
--/* Line 1455 of yacc.c */
--#line 9206 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9206 "sql/sql_yacc.yy"
- { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); }
- break;
-
- case 1304:
-
--/* Line 1455 of yacc.c */
--#line 9208 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9208 "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 1305:
-
--/* Line 1455 of yacc.c */
--#line 9211 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9211 "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. */
-@@ -27979,8 +28009,8 @@
-
- case 1306:
-
--/* Line 1455 of yacc.c */
--#line 9219 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9219 "sql/sql_yacc.yy"
- {
- add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
- Lex->pop_context();
-@@ -27990,8 +28020,8 @@
-
- case 1307:
-
--/* Line 1455 of yacc.c */
--#line 9226 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9226 "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. */
-@@ -28003,8 +28033,8 @@
-
- case 1308:
-
--/* Line 1455 of yacc.c */
--#line 9234 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9234 "sql/sql_yacc.yy"
- {
- (yyvsp[(3) - (6)].table_list)->straight=1;
- add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
-@@ -28015,8 +28045,8 @@
-
- case 1309:
-
--/* Line 1455 of yacc.c */
--#line 9242 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9242 "sql/sql_yacc.yy"
- {
- MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
- }
-@@ -28024,15 +28054,15 @@
-
- case 1310:
-
--/* Line 1455 of yacc.c */
--#line 9246 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9246 "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 1311:
-
--/* Line 1455 of yacc.c */
--#line 9248 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9248 "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);
-@@ -28041,8 +28071,8 @@
-
- case 1312:
-
--/* Line 1455 of yacc.c */
--#line 9256 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9256 "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. */
-@@ -28054,8 +28084,8 @@
-
- case 1313:
-
--/* Line 1455 of yacc.c */
--#line 9264 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9264 "sql/sql_yacc.yy"
- {
- add_join_on((yyvsp[(5) - (8)].table_list),(yyvsp[(8) - (8)].item));
- Lex->pop_context();
-@@ -28067,8 +28097,8 @@
-
- case 1314:
-
--/* Line 1455 of yacc.c */
--#line 9272 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9272 "sql/sql_yacc.yy"
- {
- MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
- }
-@@ -28076,8 +28106,8 @@
-
- case 1315:
-
--/* Line 1455 of yacc.c */
--#line 9276 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9276 "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;
-@@ -28087,8 +28117,8 @@
-
- case 1316:
-
--/* Line 1455 of yacc.c */
--#line 9282 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9282 "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);
-@@ -28099,8 +28129,8 @@
-
- case 1317:
-
--/* Line 1455 of yacc.c */
--#line 9292 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9292 "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. */
-@@ -28112,8 +28142,8 @@
-
- case 1318:
-
--/* Line 1455 of yacc.c */
--#line 9300 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9300 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (!((yyval.table_list)= lex->current_select->convert_right_join()))
-@@ -28126,8 +28156,8 @@
-
- case 1319:
-
--/* Line 1455 of yacc.c */
--#line 9309 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9309 "sql/sql_yacc.yy"
- {
- MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
- }
-@@ -28135,8 +28165,8 @@
-
- case 1320:
-
--/* Line 1455 of yacc.c */
--#line 9313 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9313 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (!((yyval.table_list)= lex->current_select->convert_right_join()))
-@@ -28147,8 +28177,8 @@
-
- case 1321:
-
--/* Line 1455 of yacc.c */
--#line 9320 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9320 "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);
-@@ -28160,29 +28190,29 @@
-
- case 1322:
-
--/* Line 1455 of yacc.c */
--#line 9330 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9330 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1323:
-
--/* Line 1455 of yacc.c */
--#line 9331 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9331 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1324:
-
--/* Line 1455 of yacc.c */
--#line 9332 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9332 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1325:
-
--/* Line 1455 of yacc.c */
--#line 9344 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9344 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->table_join_options= 0;
-@@ -28191,8 +28221,8 @@
-
- case 1326:
-
--/* Line 1455 of yacc.c */
--#line 9349 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9349 "sql/sql_yacc.yy"
- {
- if (!((yyval.table_list)= Select->add_table_to_list(YYTHD, (yyvsp[(2) - (4)].table), (yyvsp[(3) - (4)].lex_str_ptr),
- Select->get_table_join_options(),
-@@ -28206,8 +28236,8 @@
-
- case 1327:
-
--/* Line 1455 of yacc.c */
--#line 9359 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9359 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX *sel= lex->current_select;
-@@ -28233,8 +28263,8 @@
-
- case 1328:
-
--/* Line 1455 of yacc.c */
--#line 9399 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9399 "sql/sql_yacc.yy"
- {
- /* Use $2 instead of Lex->current_select as derived table will
- alter value of Lex->current_select. */
-@@ -28286,8 +28316,8 @@
-
- case 1330:
-
--/* Line 1455 of yacc.c */
--#line 9453 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9453 "sql/sql_yacc.yy"
- {
- if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
- MYSQL_YYABORT;
-@@ -28296,8 +28326,8 @@
-
- case 1331:
-
--/* Line 1455 of yacc.c */
--#line 9458 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9458 "sql/sql_yacc.yy"
- {
- /*
- Remove from the name resolution context stack the context of the
-@@ -28309,8 +28339,8 @@
-
- case 1333:
-
--/* Line 1455 of yacc.c */
--#line 9471 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9471 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX * sel= lex->current_select;
-@@ -28330,8 +28360,8 @@
-
- case 1334:
-
--/* Line 1455 of yacc.c */
--#line 9490 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9490 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX *sel= lex->current_select;
-@@ -28343,8 +28373,8 @@
-
- case 1335:
-
--/* Line 1455 of yacc.c */
--#line 9498 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9498 "sql/sql_yacc.yy"
- {
- Select->parsing_place= NO_MATTER;
- }
-@@ -28352,8 +28382,8 @@
-
- case 1337:
-
--/* Line 1455 of yacc.c */
--#line 9507 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9507 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if ((yyvsp[(1) - (1)].select_lex)->init_nested_join(lex->thd))
-@@ -28363,8 +28393,8 @@
-
- case 1338:
-
--/* Line 1455 of yacc.c */
--#line 9513 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9513 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- /* for normal joins, $3 != NULL and end_nested_join() != NULL,
-@@ -28382,8 +28412,8 @@
-
- case 1339:
-
--/* Line 1455 of yacc.c */
--#line 9529 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9529 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->derived_tables|= DERIVED_SUBQUERY;
-@@ -28404,8 +28434,8 @@
-
- case 1340:
-
--/* Line 1455 of yacc.c */
--#line 9546 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9546 "sql/sql_yacc.yy"
- {
- Select->parsing_place= NO_MATTER;
- }
-@@ -28413,15 +28443,15 @@
-
- case 1342:
-
--/* Line 1455 of yacc.c */
--#line 9553 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9553 "sql/sql_yacc.yy"
- { (yyval.select_lex)= Select; }
- break;
-
- case 1343:
-
--/* Line 1455 of yacc.c */
--#line 9558 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9558 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -28448,22 +28478,22 @@
-
- case 1344:
-
--/* Line 1455 of yacc.c */
--#line 9583 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9583 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1345:
-
--/* Line 1455 of yacc.c */
--#line 9584 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9584 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1346:
-
--/* Line 1455 of yacc.c */
--#line 9589 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9589 "sql/sql_yacc.yy"
- {
- (yyval.num)= old_mode ? INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL;
- }
-@@ -28471,43 +28501,43 @@
-
- case 1347:
-
--/* Line 1455 of yacc.c */
--#line 9592 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9592 "sql/sql_yacc.yy"
- { (yyval.num)= INDEX_HINT_MASK_JOIN; }
- break;
-
- case 1348:
-
--/* Line 1455 of yacc.c */
--#line 9593 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9593 "sql/sql_yacc.yy"
- { (yyval.num)= INDEX_HINT_MASK_ORDER; }
- break;
-
- case 1349:
-
--/* Line 1455 of yacc.c */
--#line 9594 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9594 "sql/sql_yacc.yy"
- { (yyval.num)= INDEX_HINT_MASK_GROUP; }
- break;
-
- case 1350:
-
--/* Line 1455 of yacc.c */
--#line 9598 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9598 "sql/sql_yacc.yy"
- { (yyval.index_hint)= INDEX_HINT_FORCE; }
- break;
-
- case 1351:
-
--/* Line 1455 of yacc.c */
--#line 9599 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9599 "sql/sql_yacc.yy"
- { (yyval.index_hint)= INDEX_HINT_IGNORE; }
- break;
-
- case 1352:
-
--/* Line 1455 of yacc.c */
--#line 9604 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9604 "sql/sql_yacc.yy"
- {
- Select->set_index_hint_type((yyvsp[(1) - (3)].index_hint), (yyvsp[(3) - (3)].num));
- }
-@@ -28515,8 +28545,8 @@
-
- case 1354:
-
--/* Line 1455 of yacc.c */
--#line 9609 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9609 "sql/sql_yacc.yy"
- {
- Select->set_index_hint_type(INDEX_HINT_USE, (yyvsp[(3) - (3)].num));
- }
-@@ -28524,50 +28554,50 @@
-
- case 1359:
-
--/* Line 1455 of yacc.c */
--#line 9622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9622 "sql/sql_yacc.yy"
- { Select->alloc_index_hints(YYTHD); }
- break;
-
- case 1361:
-
--/* Line 1455 of yacc.c */
--#line 9626 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9626 "sql/sql_yacc.yy"
- { Select->clear_index_hints(); }
- break;
-
- case 1363:
-
--/* Line 1455 of yacc.c */
--#line 9631 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9631 "sql/sql_yacc.yy"
- { Select->add_index_hint(YYTHD, NULL, 0); }
- break;
-
- case 1364:
-
--/* Line 1455 of yacc.c */
--#line 9632 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9632 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1365:
-
--/* Line 1455 of yacc.c */
--#line 9637 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9637 "sql/sql_yacc.yy"
- { Select->add_index_hint(YYTHD, (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
- break;
-
- case 1366:
-
--/* Line 1455 of yacc.c */
--#line 9639 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9639 "sql/sql_yacc.yy"
- { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); }
- break;
-
- case 1369:
-
--/* Line 1455 of yacc.c */
--#line 9649 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9649 "sql/sql_yacc.yy"
- {
- if (!((yyval.string_list)= new List<String>))
- MYSQL_YYABORT;
-@@ -28582,8 +28612,8 @@
-
- case 1370:
-
--/* Line 1455 of yacc.c */
--#line 9660 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9660 "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,
-@@ -28597,190 +28627,190 @@
-
- case 1371:
-
--/* Line 1455 of yacc.c */
--#line 9672 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9672 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1372:
-
--/* Line 1455 of yacc.c */
--#line 9673 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9673 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_DAY_HOUR; }
- break;
-
- case 1373:
-
--/* Line 1455 of yacc.c */
--#line 9674 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9674 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
- break;
-
- case 1374:
-
--/* Line 1455 of yacc.c */
--#line 9675 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9675 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_DAY_MINUTE; }
- break;
-
- case 1375:
-
--/* Line 1455 of yacc.c */
--#line 9676 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9676 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_DAY_SECOND; }
- break;
-
- case 1376:
-
--/* Line 1455 of yacc.c */
--#line 9677 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9677 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
- break;
-
- case 1377:
-
--/* Line 1455 of yacc.c */
--#line 9678 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9678 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_HOUR_MINUTE; }
- break;
-
- case 1378:
-
--/* Line 1455 of yacc.c */
--#line 9679 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9679 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_HOUR_SECOND; }
- break;
-
- case 1379:
-
--/* Line 1455 of yacc.c */
--#line 9680 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9680 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
- break;
-
- case 1380:
-
--/* Line 1455 of yacc.c */
--#line 9681 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9681 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_MINUTE_SECOND; }
- break;
-
- case 1381:
-
--/* Line 1455 of yacc.c */
--#line 9682 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9682 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
- break;
-
- case 1382:
-
--/* Line 1455 of yacc.c */
--#line 9683 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9683 "sql/sql_yacc.yy"
- { (yyval.interval)=INTERVAL_YEAR_MONTH; }
- break;
-
- case 1383:
-
--/* Line 1455 of yacc.c */
--#line 9687 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9687 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_DAY; }
- break;
-
- case 1384:
-
--/* Line 1455 of yacc.c */
--#line 9688 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9688 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_WEEK; }
- break;
-
- case 1385:
-
--/* Line 1455 of yacc.c */
--#line 9689 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9689 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_HOUR; }
- break;
-
- case 1386:
-
--/* Line 1455 of yacc.c */
--#line 9690 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9690 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_MINUTE; }
- break;
-
- case 1387:
-
--/* Line 1455 of yacc.c */
--#line 9691 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9691 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_MONTH; }
- break;
-
- case 1388:
-
--/* Line 1455 of yacc.c */
--#line 9692 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9692 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_QUARTER; }
- break;
-
- case 1389:
-
--/* Line 1455 of yacc.c */
--#line 9693 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9693 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_SECOND; }
- break;
-
- case 1390:
-
--/* Line 1455 of yacc.c */
--#line 9694 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9694 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
- break;
-
- case 1391:
-
--/* Line 1455 of yacc.c */
--#line 9695 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9695 "sql/sql_yacc.yy"
- { (yyval.interval_time_st)=INTERVAL_YEAR; }
- break;
-
- case 1392:
-
--/* Line 1455 of yacc.c */
--#line 9699 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9699 "sql/sql_yacc.yy"
- {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATE;}
- break;
-
- case 1393:
-
--/* Line 1455 of yacc.c */
--#line 9700 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9700 "sql/sql_yacc.yy"
- {(yyval.date_time_type)=MYSQL_TIMESTAMP_TIME;}
- break;
-
- case 1394:
-
--/* Line 1455 of yacc.c */
--#line 9701 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9701 "sql/sql_yacc.yy"
- {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
- break;
-
- case 1395:
-
--/* Line 1455 of yacc.c */
--#line 9702 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9702 "sql/sql_yacc.yy"
- {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
- break;
-
- case 1399:
-
--/* Line 1455 of yacc.c */
--#line 9712 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9712 "sql/sql_yacc.yy"
- { (yyval.lex_str_ptr)=0; }
- break;
-
- case 1400:
-
--/* Line 1455 of yacc.c */
--#line 9714 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9714 "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)
-@@ -28790,15 +28820,15 @@
-
- case 1403:
-
--/* Line 1455 of yacc.c */
--#line 9727 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9727 "sql/sql_yacc.yy"
- { Select->where= 0; }
- break;
-
- case 1404:
-
--/* Line 1455 of yacc.c */
--#line 9729 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9729 "sql/sql_yacc.yy"
- {
- Select->parsing_place= IN_WHERE;
- }
-@@ -28806,8 +28836,8 @@
-
- case 1405:
-
--/* Line 1455 of yacc.c */
--#line 9733 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9733 "sql/sql_yacc.yy"
- {
- SELECT_LEX *select= Select;
- select->where= (yyvsp[(3) - (3)].item);
-@@ -28819,8 +28849,8 @@
-
- case 1407:
-
--/* Line 1455 of yacc.c */
--#line 9745 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9745 "sql/sql_yacc.yy"
- {
- Select->parsing_place= IN_HAVING;
- }
-@@ -28828,8 +28858,8 @@
-
- case 1408:
-
--/* Line 1455 of yacc.c */
--#line 9749 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9749 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->having= (yyvsp[(3) - (3)].item);
-@@ -28841,8 +28871,8 @@
-
- case 1409:
-
--/* Line 1455 of yacc.c */
--#line 9760 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9760 "sql/sql_yacc.yy"
- {
- Lex->escape_used= TRUE;
- (yyval.item)= (yyvsp[(2) - (2)].item);
-@@ -28851,8 +28881,8 @@
-
- case 1410:
-
--/* Line 1455 of yacc.c */
--#line 9765 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9765 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- Lex->escape_used= FALSE;
-@@ -28866,29 +28896,29 @@
-
- case 1413:
-
--/* Line 1455 of yacc.c */
--#line 9787 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9787 "sql/sql_yacc.yy"
- { if (add_group_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
- break;
-
- case 1414:
-
--/* Line 1455 of yacc.c */
--#line 9789 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9789 "sql/sql_yacc.yy"
- { if (add_group_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
- break;
-
- case 1415:
-
--/* Line 1455 of yacc.c */
--#line 9793 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9793 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1416:
-
--/* Line 1455 of yacc.c */
--#line 9795 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9795 "sql/sql_yacc.yy"
- {
- /*
- 'WITH CUBE' is reserved in the MySQL syntax, but not implemented,
-@@ -28912,8 +28942,8 @@
-
- case 1417:
-
--/* Line 1455 of yacc.c */
--#line 9815 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9815 "sql/sql_yacc.yy"
- {
- /*
- 'WITH ROLLUP' is needed for backward compatibility,
-@@ -28935,8 +28965,8 @@
-
- case 1421:
-
--/* Line 1455 of yacc.c */
--#line 9849 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9849 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- bool ascending= ((yyvsp[(2) - (2)].num) == 1) ? true : false;
-@@ -28947,8 +28977,8 @@
-
- case 1424:
-
--/* Line 1455 of yacc.c */
--#line 9868 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9868 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- SELECT_LEX *sel= lex->current_select;
-@@ -28983,43 +29013,43 @@
-
- case 1426:
-
--/* Line 1455 of yacc.c */
--#line 9903 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9903 "sql/sql_yacc.yy"
- { if (add_order_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
- break;
-
- case 1427:
-
--/* Line 1455 of yacc.c */
--#line 9905 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9905 "sql/sql_yacc.yy"
- { if (add_order_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
- break;
-
- case 1428:
-
--/* Line 1455 of yacc.c */
--#line 9909 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9909 "sql/sql_yacc.yy"
- { (yyval.num) = 1; }
- break;
-
- case 1429:
-
--/* Line 1455 of yacc.c */
--#line 9910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9910 "sql/sql_yacc.yy"
- { (yyval.num) =1; }
- break;
-
- case 1430:
-
--/* Line 1455 of yacc.c */
--#line 9911 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9911 "sql/sql_yacc.yy"
- { (yyval.num) =0; }
- break;
-
- case 1431:
-
--/* Line 1455 of yacc.c */
--#line 9916 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9916 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- SELECT_LEX *sel= lex->current_select;
-@@ -29030,29 +29060,29 @@
-
- case 1432:
-
--/* Line 1455 of yacc.c */
--#line 9922 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9922 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1433:
-
--/* Line 1455 of yacc.c */
--#line 9926 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9926 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1434:
-
--/* Line 1455 of yacc.c */
--#line 9927 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9927 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1435:
-
--/* Line 1455 of yacc.c */
--#line 9932 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9932 "sql/sql_yacc.yy"
- {
- Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
- }
-@@ -29060,8 +29090,8 @@
-
- case 1436:
-
--/* Line 1455 of yacc.c */
--#line 9939 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9939 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->select_limit= (yyvsp[(1) - (1)].item);
-@@ -29072,8 +29102,8 @@
-
- case 1437:
-
--/* Line 1455 of yacc.c */
--#line 9946 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9946 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->select_limit= (yyvsp[(3) - (3)].item);
-@@ -29084,8 +29114,8 @@
-
- case 1438:
-
--/* Line 1455 of yacc.c */
--#line 9953 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9953 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->select_limit= (yyvsp[(1) - (3)].item);
-@@ -29096,8 +29126,8 @@
-
- case 1439:
-
--/* Line 1455 of yacc.c */
--#line 9963 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9963 "sql/sql_yacc.yy"
- {
- Item_splocal *splocal;
- THD *thd= YYTHD;
-@@ -29135,8 +29165,8 @@
-
- case 1440:
-
--/* Line 1455 of yacc.c */
--#line 9997 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 9997 "sql/sql_yacc.yy"
- {
- ((Item_param *) (yyvsp[(1) - (1)].item))->limit_clause_param= TRUE;
- }
-@@ -29144,8 +29174,8 @@
-
- case 1441:
-
--/* Line 1455 of yacc.c */
--#line 10001 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10001 "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)
-@@ -29155,8 +29185,8 @@
-
- case 1442:
-
--/* Line 1455 of yacc.c */
--#line 10007 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10007 "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)
-@@ -29166,8 +29196,8 @@
-
- case 1443:
-
--/* Line 1455 of yacc.c */
--#line 10013 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10013 "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)
-@@ -29177,8 +29207,8 @@
-
- case 1444:
-
--/* Line 1455 of yacc.c */
--#line 10022 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10022 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->current_select->select_limit= 0;
-@@ -29187,8 +29217,8 @@
-
- case 1445:
-
--/* Line 1455 of yacc.c */
--#line 10027 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10027 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- sel->select_limit= (yyvsp[(2) - (2)].item);
-@@ -29199,155 +29229,155 @@
-
- case 1446:
-
--/* Line 1455 of yacc.c */
--#line 10036 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10036 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1447:
-
--/* Line 1455 of yacc.c */
--#line 10037 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10037 "sql/sql_yacc.yy"
- { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
- break;
-
- case 1448:
-
--/* Line 1455 of yacc.c */
--#line 10038 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10038 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1449:
-
--/* Line 1455 of yacc.c */
--#line 10039 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10039 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1450:
-
--/* Line 1455 of yacc.c */
--#line 10040 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10040 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1451:
-
--/* Line 1455 of yacc.c */
--#line 10041 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10041 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1452:
-
--/* Line 1455 of yacc.c */
--#line 10045 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10045 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1453:
-
--/* Line 1455 of yacc.c */
--#line 10046 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10046 "sql/sql_yacc.yy"
- { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
- break;
-
- case 1454:
-
--/* Line 1455 of yacc.c */
--#line 10047 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10047 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1455:
-
--/* Line 1455 of yacc.c */
--#line 10048 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10048 "sql/sql_yacc.yy"
- { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1456:
-
--/* Line 1455 of yacc.c */
--#line 10049 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10049 "sql/sql_yacc.yy"
- { MYSQL_YYABORT; }
- break;
-
- case 1457:
-
--/* Line 1455 of yacc.c */
--#line 10053 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10053 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1458:
-
--/* Line 1455 of yacc.c */
--#line 10054 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10054 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1459:
-
--/* Line 1455 of yacc.c */
--#line 10055 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10055 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1460:
-
--/* Line 1455 of yacc.c */
--#line 10056 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10056 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1461:
-
--/* Line 1455 of yacc.c */
--#line 10057 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10057 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1462:
-
--/* Line 1455 of yacc.c */
--#line 10061 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10061 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1463:
-
--/* Line 1455 of yacc.c */
--#line 10062 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10062 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1464:
-
--/* Line 1455 of yacc.c */
--#line 10063 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10063 "sql/sql_yacc.yy"
- { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
- break;
-
- case 1465:
-
--/* Line 1455 of yacc.c */
--#line 10064 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10064 "sql/sql_yacc.yy"
- { MYSQL_YYABORT; }
- break;
-
- case 1466:
-
--/* Line 1455 of yacc.c */
--#line 10069 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10069 "sql/sql_yacc.yy"
- { my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); }
- break;
-
- case 1470:
-
--/* Line 1455 of yacc.c */
--#line 10080 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10080 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
-
-@@ -29378,22 +29408,22 @@
-
- case 1472:
-
--/* Line 1455 of yacc.c */
--#line 10110 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10110 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1473:
-
--/* Line 1455 of yacc.c */
--#line 10111 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10111 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1476:
-
--/* Line 1455 of yacc.c */
--#line 10121 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10121 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -29406,8 +29436,8 @@
-
- case 1477:
-
--/* Line 1455 of yacc.c */
--#line 10132 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10132 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!lex->describe && (!(lex->result= new select_dumpvar())))
-@@ -29417,22 +29447,22 @@
-
- case 1478:
-
--/* Line 1455 of yacc.c */
--#line 10138 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10138 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1480:
-
--/* Line 1455 of yacc.c */
--#line 10143 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10143 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1481:
-
--/* Line 1455 of yacc.c */
--#line 10148 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10148 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->result)
-@@ -29455,8 +29485,8 @@
-
- case 1482:
-
--/* Line 1455 of yacc.c */
--#line 10167 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10167 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- sp_variable_t *t;
-@@ -29489,8 +29519,8 @@
-
- case 1483:
-
--/* Line 1455 of yacc.c */
--#line 10199 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10199 "sql/sql_yacc.yy"
- {
- if (! Lex->parsing_options.allows_select_into)
- {
-@@ -29502,8 +29532,8 @@
-
- case 1485:
-
--/* Line 1455 of yacc.c */
--#line 10211 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10211 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
-@@ -29515,15 +29545,15 @@
-
- case 1486:
-
--/* Line 1455 of yacc.c */
--#line 10219 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10219 "sql/sql_yacc.yy"
- { Lex->exchange->cs= (yyvsp[(4) - (4)].charset); }
- break;
-
- case 1488:
-
--/* Line 1455 of yacc.c */
--#line 10222 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10222 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!lex->describe)
-@@ -29539,8 +29569,8 @@
-
- case 1489:
-
--/* Line 1455 of yacc.c */
--#line 10234 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10234 "sql/sql_yacc.yy"
- {
- Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
- }
-@@ -29548,8 +29578,8 @@
-
- case 1490:
-
--/* Line 1455 of yacc.c */
--#line 10245 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10245 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_DO;
-@@ -29559,8 +29589,8 @@
-
- case 1491:
-
--/* Line 1455 of yacc.c */
--#line 10251 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10251 "sql/sql_yacc.yy"
- {
- Lex->insert_list= (yyvsp[(3) - (3)].item_list);
- }
-@@ -29568,8 +29598,8 @@
-
- case 1492:
-
--/* Line 1455 of yacc.c */
--#line 10262 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10262 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_DROP_TABLE;
-@@ -29582,22 +29612,22 @@
-
- case 1493:
-
--/* Line 1455 of yacc.c */
--#line 10271 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10271 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1494:
-
--/* Line 1455 of yacc.c */
--#line 10272 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10272 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1495:
-
--/* Line 1455 of yacc.c */
--#line 10273 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10273 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (6)].lex_str).str);
-@@ -29617,8 +29647,8 @@
-
- case 1496:
-
--/* Line 1455 of yacc.c */
--#line 10289 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10289 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_DROP_DB;
-@@ -29629,8 +29659,8 @@
-
- case 1497:
-
--/* Line 1455 of yacc.c */
--#line 10296 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10296 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -29657,8 +29687,8 @@
-
- case 1498:
-
--/* Line 1455 of yacc.c */
--#line 10319 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10319 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -29683,8 +29713,8 @@
-
- case 1499:
-
--/* Line 1455 of yacc.c */
--#line 10340 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10340 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->sphead)
-@@ -29700,8 +29730,8 @@
-
- case 1500:
-
--/* Line 1455 of yacc.c */
--#line 10352 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10352 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_DROP_USER;
- }
-@@ -29709,8 +29739,8 @@
-
- case 1501:
-
--/* Line 1455 of yacc.c */
--#line 10356 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10356 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_DROP_VIEW;
-@@ -29722,15 +29752,15 @@
-
- case 1502:
-
--/* Line 1455 of yacc.c */
--#line 10364 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10364 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1503:
-
--/* Line 1455 of yacc.c */
--#line 10366 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10366 "sql/sql_yacc.yy"
- {
- Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
- Lex->spname= (yyvsp[(4) - (4)].spname);
-@@ -29740,8 +29770,8 @@
-
- case 1504:
-
--/* Line 1455 of yacc.c */
--#line 10372 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10372 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_DROP_TRIGGER;
-@@ -29752,8 +29782,8 @@
-
- case 1505:
-
--/* Line 1455 of yacc.c */
--#line 10379 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10379 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE;
-@@ -29762,8 +29792,8 @@
-
- case 1506:
-
--/* Line 1455 of yacc.c */
--#line 10384 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10384 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
-@@ -29772,8 +29802,8 @@
-
- case 1507:
-
--/* Line 1455 of yacc.c */
--#line 10389 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10389 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_DROP_SERVER;
- Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
-@@ -29784,8 +29814,8 @@
-
- case 1510:
-
--/* Line 1455 of yacc.c */
--#line 10404 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10404 "sql/sql_yacc.yy"
- {
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
- TL_OPTION_UPDATING,
-@@ -29797,8 +29827,8 @@
-
- case 1513:
-
--/* Line 1455 of yacc.c */
--#line 10420 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10420 "sql/sql_yacc.yy"
- {
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
- TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -29810,36 +29840,36 @@
-
- case 1514:
-
--/* Line 1455 of yacc.c */
--#line 10430 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10430 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 1515:
-
--/* Line 1455 of yacc.c */
--#line 10431 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10431 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 1516:
-
--/* Line 1455 of yacc.c */
--#line 10435 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10435 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 1517:
-
--/* Line 1455 of yacc.c */
--#line 10436 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10436 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 1518:
-
--/* Line 1455 of yacc.c */
--#line 10444 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10444 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_INSERT;
-@@ -29850,8 +29880,8 @@
-
- case 1519:
-
--/* Line 1455 of yacc.c */
--#line 10452 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10452 "sql/sql_yacc.yy"
- {
- Select->set_lock_for_tables((yyvsp[(3) - (5)].lock_type));
- Lex->current_select= &Lex->select_lex;
-@@ -29860,15 +29890,15 @@
-
- case 1520:
-
--/* Line 1455 of yacc.c */
--#line 10457 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10457 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1521:
-
--/* Line 1455 of yacc.c */
--#line 10462 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10462 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_REPLACE;
-@@ -29879,8 +29909,8 @@
-
- case 1522:
-
--/* Line 1455 of yacc.c */
--#line 10469 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10469 "sql/sql_yacc.yy"
- {
- Select->set_lock_for_tables((yyvsp[(3) - (4)].lock_type));
- Lex->current_select= &Lex->select_lex;
-@@ -29889,15 +29919,15 @@
-
- case 1523:
-
--/* Line 1455 of yacc.c */
--#line 10474 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10474 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1524:
-
--/* Line 1455 of yacc.c */
--#line 10479 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10479 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_QUERY_CACHE
- /*
-@@ -29914,15 +29944,15 @@
-
- case 1525:
-
--/* Line 1455 of yacc.c */
--#line 10491 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10491 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
- break;
-
- case 1526:
-
--/* Line 1455 of yacc.c */
--#line 10493 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10493 "sql/sql_yacc.yy"
- {
- Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
- YYTHD->query());
-@@ -29934,22 +29964,22 @@
-
- case 1527:
-
--/* Line 1455 of yacc.c */
--#line 10500 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10500 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE; }
- break;
-
- case 1528:
-
--/* Line 1455 of yacc.c */
--#line 10504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10504 "sql/sql_yacc.yy"
- { (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); }
- break;
-
- case 1529:
-
--/* Line 1455 of yacc.c */
--#line 10506 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10506 "sql/sql_yacc.yy"
- {
- Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
- YYTHD->query());
-@@ -29961,22 +29991,22 @@
-
- case 1530:
-
--/* Line 1455 of yacc.c */
--#line 10516 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10516 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1531:
-
--/* Line 1455 of yacc.c */
--#line 10517 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10517 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1532:
-
--/* Line 1455 of yacc.c */
--#line 10522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10522 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->field_list.empty();
-@@ -29987,29 +30017,29 @@
-
- case 1533:
-
--/* Line 1455 of yacc.c */
--#line 10530 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10530 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1534:
-
--/* Line 1455 of yacc.c */
--#line 10531 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10531 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1535:
-
--/* Line 1455 of yacc.c */
--#line 10532 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10532 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1536:
-
--/* Line 1455 of yacc.c */
--#line 10534 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10534 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!(lex->insert_list = new List_item) ||
-@@ -30020,64 +30050,64 @@
-
- case 1538:
-
--/* Line 1455 of yacc.c */
--#line 10544 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10544 "sql/sql_yacc.yy"
- { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
- break;
-
- case 1539:
-
--/* Line 1455 of yacc.c */
--#line 10545 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10545 "sql/sql_yacc.yy"
- { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
- break;
-
- case 1540:
-
--/* Line 1455 of yacc.c */
--#line 10549 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10549 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1541:
-
--/* Line 1455 of yacc.c */
--#line 10550 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10550 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1542:
-
--/* Line 1455 of yacc.c */
--#line 10552 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10552 "sql/sql_yacc.yy"
- { Select->set_braces(0);}
- break;
-
- case 1543:
-
--/* Line 1455 of yacc.c */
--#line 10553 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10553 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1544:
-
--/* Line 1455 of yacc.c */
--#line 10555 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10555 "sql/sql_yacc.yy"
- { Select->set_braces(1);}
- break;
-
- case 1545:
-
--/* Line 1455 of yacc.c */
--#line 10556 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10556 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1550:
-
--/* Line 1455 of yacc.c */
--#line 10571 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10571 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->field_list.push_back((yyvsp[(1) - (3)].item)) ||
-@@ -30088,36 +30118,36 @@
-
- case 1551:
-
--/* Line 1455 of yacc.c */
--#line 10580 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10580 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1552:
-
--/* Line 1455 of yacc.c */
--#line 10581 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10581 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1553:
-
--/* Line 1455 of yacc.c */
--#line 10585 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10585 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1554:
-
--/* Line 1455 of yacc.c */
--#line 10586 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10586 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1555:
-
--/* Line 1455 of yacc.c */
--#line 10591 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10591 "sql/sql_yacc.yy"
- {
- if (!(Lex->insert_list = new List_item))
- MYSQL_YYABORT;
-@@ -30126,8 +30156,8 @@
-
- case 1556:
-
--/* Line 1455 of yacc.c */
--#line 10596 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10596 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->many_values.push_back(lex->insert_list))
-@@ -30137,15 +30167,15 @@
-
- case 1557:
-
--/* Line 1455 of yacc.c */
--#line 10604 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10604 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1559:
-
--/* Line 1455 of yacc.c */
--#line 10610 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10610 "sql/sql_yacc.yy"
- {
- if (Lex->insert_list->push_back((yyvsp[(3) - (3)].item)))
- MYSQL_YYABORT;
-@@ -30154,8 +30184,8 @@
-
- case 1560:
-
--/* Line 1455 of yacc.c */
--#line 10615 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10615 "sql/sql_yacc.yy"
- {
- if (Lex->insert_list->push_back((yyvsp[(1) - (1)].item)))
- MYSQL_YYABORT;
-@@ -30164,15 +30194,15 @@
-
- case 1561:
-
--/* Line 1455 of yacc.c */
--#line 10622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10622 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item);}
- break;
-
- case 1562:
-
--/* Line 1455 of yacc.c */
--#line 10624 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10624 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_default_value(Lex->current_context());
- if ((yyval.item) == NULL)
-@@ -30182,15 +30212,15 @@
-
- case 1564:
-
--/* Line 1455 of yacc.c */
--#line 10633 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10633 "sql/sql_yacc.yy"
- { Lex->duplicates= DUP_UPDATE; }
- break;
-
- case 1566:
-
--/* Line 1455 of yacc.c */
--#line 10641 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10641 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- mysql_init_select(lex);
-@@ -30201,8 +30231,8 @@
-
- case 1567:
-
--/* Line 1455 of yacc.c */
--#line 10649 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10649 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->select_lex.table_list.elements > 1)
-@@ -30225,15 +30255,15 @@
-
- case 1568:
-
--/* Line 1455 of yacc.c */
--#line 10667 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10667 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1571:
-
--/* Line 1455 of yacc.c */
--#line 10677 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10677 "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;
-@@ -30242,8 +30272,8 @@
-
- case 1574:
-
--/* Line 1455 of yacc.c */
--#line 10690 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10690 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->update_list.push_back((yyvsp[(1) - (3)].item)) ||
-@@ -30254,22 +30284,22 @@
-
- case 1575:
-
--/* Line 1455 of yacc.c */
--#line 10699 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10699 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE_DEFAULT; }
- break;
-
- case 1576:
-
--/* Line 1455 of yacc.c */
--#line 10700 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10700 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
- break;
-
- case 1577:
-
--/* Line 1455 of yacc.c */
--#line 10707 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10707 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_DELETE;
-@@ -30284,8 +30314,8 @@
-
- case 1579:
-
--/* Line 1455 of yacc.c */
--#line 10722 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10722 "sql/sql_yacc.yy"
- {
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(2) - (2)].table), NULL, TL_OPTION_UPDATING,
- YYPS->m_lock_type,
-@@ -30298,15 +30328,15 @@
-
- case 1580:
-
--/* Line 1455 of yacc.c */
--#line 10731 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10731 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1581:
-
--/* Line 1455 of yacc.c */
--#line 10733 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10733 "sql/sql_yacc.yy"
- {
- mysql_init_multi_delete(Lex);
- YYPS->m_lock_type= TL_READ_DEFAULT;
-@@ -30316,8 +30346,8 @@
-
- case 1582:
-
--/* Line 1455 of yacc.c */
--#line 10739 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10739 "sql/sql_yacc.yy"
- {
- if (multi_delete_set_locks_and_link_aux_tables(Lex))
- MYSQL_YYABORT;
-@@ -30326,8 +30356,8 @@
-
- case 1583:
-
--/* Line 1455 of yacc.c */
--#line 10744 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10744 "sql/sql_yacc.yy"
- {
- mysql_init_multi_delete(Lex);
- YYPS->m_lock_type= TL_READ_DEFAULT;
-@@ -30337,8 +30367,8 @@
-
- case 1584:
-
--/* Line 1455 of yacc.c */
--#line 10750 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10750 "sql/sql_yacc.yy"
- {
- if (multi_delete_set_locks_and_link_aux_tables(Lex))
- MYSQL_YYABORT;
-@@ -30347,8 +30377,8 @@
-
- case 1587:
-
--/* Line 1455 of yacc.c */
--#line 10763 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10763 "sql/sql_yacc.yy"
- {
- Table_ident *ti= new Table_ident((yyvsp[(1) - (2)].lex_str));
- if (ti == NULL)
-@@ -30365,8 +30395,8 @@
-
- case 1588:
-
--/* Line 1455 of yacc.c */
--#line 10776 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10776 "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)
-@@ -30383,57 +30413,57 @@
-
- case 1589:
-
--/* Line 1455 of yacc.c */
--#line 10791 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10791 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1590:
-
--/* Line 1455 of yacc.c */
--#line 10792 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10792 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1591:
-
--/* Line 1455 of yacc.c */
--#line 10796 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10796 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1592:
-
--/* Line 1455 of yacc.c */
--#line 10797 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10797 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1593:
-
--/* Line 1455 of yacc.c */
--#line 10801 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10801 "sql/sql_yacc.yy"
- { Select->options|= OPTION_QUICK; }
- break;
-
- case 1594:
-
--/* Line 1455 of yacc.c */
--#line 10802 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10802 "sql/sql_yacc.yy"
- { YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; }
- break;
-
- case 1595:
-
--/* Line 1455 of yacc.c */
--#line 10803 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10803 "sql/sql_yacc.yy"
- { Lex->ignore= 1; }
- break;
-
- case 1596:
-
--/* Line 1455 of yacc.c */
--#line 10808 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10808 "sql/sql_yacc.yy"
- {
- LEX* lex= Lex;
- lex->sql_command= SQLCOM_TRUNCATE;
-@@ -30448,8 +30478,8 @@
-
- case 1597:
-
--/* Line 1455 of yacc.c */
--#line 10819 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10819 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX* lex= thd->lex;
-@@ -30462,8 +30492,8 @@
-
- case 1604:
-
--/* Line 1455 of yacc.c */
--#line 10844 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10844 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_CPU;
- }
-@@ -30471,8 +30501,8 @@
-
- case 1605:
-
--/* Line 1455 of yacc.c */
--#line 10848 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10848 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_MEMORY;
- }
-@@ -30480,8 +30510,8 @@
-
- case 1606:
-
--/* Line 1455 of yacc.c */
--#line 10852 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10852 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_BLOCK_IO;
- }
-@@ -30489,8 +30519,8 @@
-
- case 1607:
-
--/* Line 1455 of yacc.c */
--#line 10856 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10856 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_CONTEXT;
- }
-@@ -30498,8 +30528,8 @@
-
- case 1608:
-
--/* Line 1455 of yacc.c */
--#line 10860 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10860 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_PAGE_FAULTS;
- }
-@@ -30507,8 +30537,8 @@
-
- case 1609:
-
--/* Line 1455 of yacc.c */
--#line 10864 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10864 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_IPC;
- }
-@@ -30516,8 +30546,8 @@
-
- case 1610:
-
--/* Line 1455 of yacc.c */
--#line 10868 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10868 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_SWAPS;
- }
-@@ -30525,8 +30555,8 @@
-
- case 1611:
-
--/* Line 1455 of yacc.c */
--#line 10872 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10872 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_SOURCE;
- }
-@@ -30534,8 +30564,8 @@
-
- case 1612:
-
--/* Line 1455 of yacc.c */
--#line 10876 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10876 "sql/sql_yacc.yy"
- {
- Lex->profile_options|= PROFILE_ALL;
- }
-@@ -30543,8 +30573,8 @@
-
- case 1613:
-
--/* Line 1455 of yacc.c */
--#line 10883 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10883 "sql/sql_yacc.yy"
- {
- Lex->profile_query_id= 0;
- }
-@@ -30552,8 +30582,8 @@
-
- case 1614:
-
--/* Line 1455 of yacc.c */
--#line 10887 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10887 "sql/sql_yacc.yy"
- {
- Lex->profile_query_id= atoi((yyvsp[(3) - (3)].lex_str).str);
- }
-@@ -30561,8 +30591,8 @@
-
- case 1615:
-
--/* Line 1455 of yacc.c */
--#line 10896 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10896 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->wild=0;
-@@ -30574,15 +30604,15 @@
-
- case 1616:
-
--/* Line 1455 of yacc.c */
--#line 10904 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10904 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1617:
-
--/* Line 1455 of yacc.c */
--#line 10909 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10909 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_DATABASES;
-@@ -30593,8 +30623,8 @@
-
- case 1618:
-
--/* Line 1455 of yacc.c */
--#line 10916 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10916 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_TABLES;
-@@ -30606,8 +30636,8 @@
-
- case 1619:
-
--/* Line 1455 of yacc.c */
--#line 10924 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10924 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_TRIGGERS;
-@@ -30619,8 +30649,8 @@
-
- case 1620:
-
--/* Line 1455 of yacc.c */
--#line 10932 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10932 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_EVENTS;
-@@ -30632,8 +30662,8 @@
-
- case 1621:
-
--/* Line 1455 of yacc.c */
--#line 10940 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10940 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
-@@ -30645,8 +30675,8 @@
-
- case 1622:
-
--/* Line 1455 of yacc.c */
--#line 10948 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10948 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
-@@ -30658,8 +30688,8 @@
-
- case 1623:
-
--/* Line 1455 of yacc.c */
--#line 10956 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10956 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_PLUGINS;
-@@ -30670,22 +30700,22 @@
-
- case 1624:
-
--/* Line 1455 of yacc.c */
--#line 10963 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10963 "sql/sql_yacc.yy"
- { Lex->create_info.db_type= (yyvsp[(2) - (3)].db_type); }
- break;
-
- case 1625:
-
--/* Line 1455 of yacc.c */
--#line 10965 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10965 "sql/sql_yacc.yy"
- { Lex->create_info.db_type= NULL; }
- break;
-
- case 1626:
-
--/* Line 1455 of yacc.c */
--#line 10967 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10967 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_FIELDS;
-@@ -30698,8 +30728,8 @@
-
- case 1627:
-
--/* Line 1455 of yacc.c */
--#line 10976 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10976 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_SHOW_BINLOGS;
- }
-@@ -30707,8 +30737,8 @@
-
- case 1628:
-
--/* Line 1455 of yacc.c */
--#line 10980 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10980 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS;
- }
-@@ -30716,8 +30746,8 @@
-
- case 1629:
-
--/* Line 1455 of yacc.c */
--#line 10984 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10984 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
-@@ -30726,8 +30756,8 @@
-
- case 1631:
-
--/* Line 1455 of yacc.c */
--#line 10989 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10989 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS;
-@@ -30736,8 +30766,8 @@
-
- case 1633:
-
--/* Line 1455 of yacc.c */
--#line 10994 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 10994 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_KEYS;
-@@ -30750,8 +30780,8 @@
-
- case 1634:
-
--/* Line 1455 of yacc.c */
--#line 11003 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11003 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
-@@ -30762,8 +30792,8 @@
-
- case 1635:
-
--/* Line 1455 of yacc.c */
--#line 11010 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11010 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_AUTHORS;
-@@ -30776,8 +30806,8 @@
-
- case 1636:
-
--/* Line 1455 of yacc.c */
--#line 11019 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11019 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
-@@ -30790,8 +30820,8 @@
-
- case 1637:
-
--/* Line 1455 of yacc.c */
--#line 11028 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11028 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_PRIVILEGES;
-@@ -30800,43 +30830,43 @@
-
- case 1638:
-
--/* Line 1455 of yacc.c */
--#line 11033 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11033 "sql/sql_yacc.yy"
- { (void) create_select_for_variable("warning_count"); }
- break;
-
- case 1639:
-
--/* Line 1455 of yacc.c */
--#line 11035 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11035 "sql/sql_yacc.yy"
- { (void) create_select_for_variable("error_count"); }
- break;
-
- case 1640:
-
--/* Line 1455 of yacc.c */
--#line 11037 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11037 "sql/sql_yacc.yy"
- { Lex->sql_command = SQLCOM_SHOW_WARNS;}
- break;
-
- case 1641:
-
--/* Line 1455 of yacc.c */
--#line 11039 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11039 "sql/sql_yacc.yy"
- { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
- break;
-
- case 1642:
-
--/* Line 1455 of yacc.c */
--#line 11041 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11041 "sql/sql_yacc.yy"
- { Lex->sql_command = SQLCOM_SHOW_PROFILES; }
- break;
-
- case 1643:
-
--/* Line 1455 of yacc.c */
--#line 11043 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11043 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_PROFILE;
-@@ -30847,8 +30877,8 @@
-
- case 1644:
-
--/* Line 1455 of yacc.c */
--#line 11050 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11050 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_STATUS;
-@@ -30860,15 +30890,15 @@
-
- case 1645:
-
--/* Line 1455 of yacc.c */
--#line 11058 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11058 "sql/sql_yacc.yy"
- { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
- break;
-
- case 1646:
-
--/* Line 1455 of yacc.c */
--#line 11060 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11060 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_VARIABLES;
-@@ -30880,8 +30910,8 @@
-
- case 1647:
-
--/* Line 1455 of yacc.c */
--#line 11068 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11068 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_CHARSETS;
-@@ -30892,8 +30922,8 @@
-
- case 1648:
-
--/* Line 1455 of yacc.c */
--#line 11075 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11075 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_COLLATIONS;
-@@ -30904,8 +30934,8 @@
-
- case 1649:
-
--/* Line 1455 of yacc.c */
--#line 11082 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11082 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_GRANTS;
-@@ -30919,8 +30949,8 @@
-
- case 1650:
-
--/* Line 1455 of yacc.c */
--#line 11092 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11092 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SHOW_GRANTS;
-@@ -30931,8 +30961,8 @@
-
- case 1651:
-
--/* Line 1455 of yacc.c */
--#line 11099 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11099 "sql/sql_yacc.yy"
- {
- Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
- Lex->create_info.options=(yyvsp[(3) - (4)].num);
-@@ -30942,8 +30972,8 @@
-
- case 1652:
-
--/* Line 1455 of yacc.c */
--#line 11105 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11105 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command = SQLCOM_SHOW_CREATE;
-@@ -30956,8 +30986,8 @@
-
- case 1653:
-
--/* Line 1455 of yacc.c */
--#line 11114 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11114 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command = SQLCOM_SHOW_CREATE;
-@@ -30969,8 +30999,8 @@
-
- case 1654:
-
--/* Line 1455 of yacc.c */
--#line 11122 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11122 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
- }
-@@ -30978,8 +31008,8 @@
-
- case 1655:
-
--/* Line 1455 of yacc.c */
--#line 11126 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11126 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
- }
-@@ -30987,8 +31017,8 @@
-
- case 1656:
-
--/* Line 1455 of yacc.c */
--#line 11130 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11130 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -30999,8 +31029,8 @@
-
- case 1657:
-
--/* Line 1455 of yacc.c */
--#line 11137 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11137 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -31011,8 +31041,8 @@
-
- case 1658:
-
--/* Line 1455 of yacc.c */
--#line 11144 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11144 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER;
-@@ -31022,8 +31052,8 @@
-
- case 1659:
-
--/* Line 1455 of yacc.c */
--#line 11150 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11150 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
-@@ -31034,8 +31064,8 @@
-
- case 1660:
-
--/* Line 1455 of yacc.c */
--#line 11157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11157 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
-@@ -31046,8 +31076,8 @@
-
- case 1661:
-
--/* Line 1455 of yacc.c */
--#line 11164 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11164 "sql/sql_yacc.yy"
- {
- Lex->sql_command= SQLCOM_SHOW_PROC_CODE;
- Lex->spname= (yyvsp[(3) - (3)].spname);
-@@ -31056,8 +31086,8 @@
-
- case 1662:
-
--/* Line 1455 of yacc.c */
--#line 11169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11169 "sql/sql_yacc.yy"
- {
- Lex->sql_command= SQLCOM_SHOW_FUNC_CODE;
- Lex->spname= (yyvsp[(3) - (3)].spname);
-@@ -31066,8 +31096,8 @@
-
- case 1663:
-
--/* Line 1455 of yacc.c */
--#line 11174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11174 "sql/sql_yacc.yy"
- {
- Lex->spname= (yyvsp[(3) - (3)].spname);
- Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT;
-@@ -31076,85 +31106,85 @@
-
- case 1664:
-
--/* Line 1455 of yacc.c */
--#line 11182 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11182 "sql/sql_yacc.yy"
- { Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
- break;
-
- case 1665:
-
--/* Line 1455 of yacc.c */
--#line 11184 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11184 "sql/sql_yacc.yy"
- { Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
- break;
-
- case 1666:
-
--/* Line 1455 of yacc.c */
--#line 11186 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11186 "sql/sql_yacc.yy"
- { Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
- break;
-
- case 1671:
-
--/* Line 1455 of yacc.c */
--#line 11200 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11200 "sql/sql_yacc.yy"
- { (yyval.simple_string)= 0; }
- break;
-
- case 1672:
-
--/* Line 1455 of yacc.c */
--#line 11201 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11201 "sql/sql_yacc.yy"
- { (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; }
- break;
-
- case 1673:
-
--/* Line 1455 of yacc.c */
--#line 11205 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11205 "sql/sql_yacc.yy"
- { Lex->verbose=0; }
- break;
-
- case 1674:
-
--/* Line 1455 of yacc.c */
--#line 11206 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11206 "sql/sql_yacc.yy"
- { Lex->verbose=1; }
- break;
-
- case 1677:
-
--/* Line 1455 of yacc.c */
--#line 11215 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11215 "sql/sql_yacc.yy"
- { Lex->mi.log_file_name = 0; }
- break;
-
- case 1678:
-
--/* Line 1455 of yacc.c */
--#line 11216 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11216 "sql/sql_yacc.yy"
- { Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; }
- break;
-
- case 1679:
-
--/* Line 1455 of yacc.c */
--#line 11220 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11220 "sql/sql_yacc.yy"
- { Lex->mi.pos = 4; /* skip magic number */ }
- break;
-
- case 1680:
-
--/* Line 1455 of yacc.c */
--#line 11221 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11221 "sql/sql_yacc.yy"
- { Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); }
- break;
-
- case 1682:
-
--/* Line 1455 of yacc.c */
--#line 11227 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11227 "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);
-@@ -31165,8 +31195,8 @@
-
- case 1683:
-
--/* Line 1455 of yacc.c */
--#line 11234 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11234 "sql/sql_yacc.yy"
- {
- Select->where= (yyvsp[(2) - (2)].item);
- if ((yyvsp[(2) - (2)].item))
-@@ -31176,8 +31206,8 @@
-
- case 1684:
-
--/* Line 1455 of yacc.c */
--#line 11244 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11244 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- mysql_init_select(lex);
-@@ -31192,22 +31222,22 @@
-
- case 1685:
-
--/* Line 1455 of yacc.c */
--#line 11254 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11254 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1686:
-
--/* Line 1455 of yacc.c */
--#line 11256 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11256 "sql/sql_yacc.yy"
- { Lex->describe|= DESCRIBE_NORMAL; }
- break;
-
- case 1687:
-
--/* Line 1455 of yacc.c */
--#line 11258 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11258 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->select_lex.options|= SELECT_DESCRIBE;
-@@ -31216,43 +31246,43 @@
-
- case 1690:
-
--/* Line 1455 of yacc.c */
--#line 11270 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11270 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1691:
-
--/* Line 1455 of yacc.c */
--#line 11271 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11271 "sql/sql_yacc.yy"
- { Lex->describe|= DESCRIBE_EXTENDED; }
- break;
-
- case 1692:
-
--/* Line 1455 of yacc.c */
--#line 11272 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11272 "sql/sql_yacc.yy"
- { Lex->describe|= DESCRIBE_PARTITIONS; }
- break;
-
- case 1693:
-
--/* Line 1455 of yacc.c */
--#line 11276 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11276 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1694:
-
--/* Line 1455 of yacc.c */
--#line 11277 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11277 "sql/sql_yacc.yy"
- { Lex->wild= (yyvsp[(1) - (1)].string); }
- break;
-
- case 1695:
-
--/* Line 1455 of yacc.c */
--#line 11279 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11279 "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,
-@@ -31264,8 +31294,8 @@
-
- case 1696:
-
--/* Line 1455 of yacc.c */
--#line 11293 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11293 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_FLUSH;
-@@ -31276,15 +31306,15 @@
-
- case 1697:
-
--/* Line 1455 of yacc.c */
--#line 11300 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11300 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1698:
-
--/* Line 1455 of yacc.c */
--#line 11305 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11305 "sql/sql_yacc.yy"
- {
- Lex->type|= REFRESH_TABLES;
- /*
-@@ -31298,29 +31328,29 @@
-
- case 1699:
-
--/* Line 1455 of yacc.c */
--#line 11314 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11314 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1700:
-
--/* Line 1455 of yacc.c */
--#line 11315 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11315 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1702:
-
--/* Line 1455 of yacc.c */
--#line 11320 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11320 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1703:
-
--/* Line 1455 of yacc.c */
--#line 11322 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11322 "sql/sql_yacc.yy"
- {
- TABLE_LIST *tables= Lex->query_tables;
- Lex->type|= REFRESH_READ_LOCK;
-@@ -31335,92 +31365,92 @@
-
- case 1705:
-
--/* Line 1455 of yacc.c */
--#line 11337 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11337 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1706:
-
--/* Line 1455 of yacc.c */
--#line 11342 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11342 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_ERROR_LOG; }
- break;
-
- case 1707:
-
--/* Line 1455 of yacc.c */
--#line 11344 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11344 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_ENGINE_LOG; }
- break;
-
- case 1708:
-
--/* Line 1455 of yacc.c */
--#line 11346 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11346 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_GENERAL_LOG; }
- break;
-
- case 1709:
-
--/* Line 1455 of yacc.c */
--#line 11348 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11348 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_SLOW_LOG; }
- break;
-
- case 1710:
-
--/* Line 1455 of yacc.c */
--#line 11350 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11350 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_BINARY_LOG; }
- break;
-
- case 1711:
-
--/* Line 1455 of yacc.c */
--#line 11352 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11352 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_RELAY_LOG; }
- break;
-
- case 1712:
-
--/* Line 1455 of yacc.c */
--#line 11354 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11354 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_QUERY_CACHE_FREE; }
- break;
-
- case 1713:
-
--/* Line 1455 of yacc.c */
--#line 11356 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11356 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_HOSTS; }
- break;
-
- case 1714:
-
--/* Line 1455 of yacc.c */
--#line 11358 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11358 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_GRANT; }
- break;
-
- case 1715:
-
--/* Line 1455 of yacc.c */
--#line 11360 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11360 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_LOG; }
- break;
-
- case 1716:
-
--/* Line 1455 of yacc.c */
--#line 11362 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11362 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_STATUS; }
- break;
-
- case 1717:
-
--/* Line 1455 of yacc.c */
--#line 11364 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11364 "sql/sql_yacc.yy"
- {
- Lex->type|= REFRESH_SLAVE;
- Lex->reset_slave_info.all= false;
-@@ -31429,43 +31459,43 @@
-
- case 1718:
-
--/* Line 1455 of yacc.c */
--#line 11369 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11369 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_MASTER; }
- break;
-
- case 1719:
-
--/* Line 1455 of yacc.c */
--#line 11371 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11371 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_DES_KEY_FILE; }
- break;
-
- case 1720:
-
--/* Line 1455 of yacc.c */
--#line 11373 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11373 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_USER_RESOURCES; }
- break;
-
- case 1721:
-
--/* Line 1455 of yacc.c */
--#line 11377 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11377 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1722:
-
--/* Line 1455 of yacc.c */
--#line 11378 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11378 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1723:
-
--/* Line 1455 of yacc.c */
--#line 11383 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11383 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_RESET; lex->type=0;
-@@ -31474,57 +31504,57 @@
-
- case 1724:
-
--/* Line 1455 of yacc.c */
--#line 11388 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11388 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1727:
-
--/* Line 1455 of yacc.c */
--#line 11397 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11397 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_SLAVE; }
- break;
-
- case 1728:
-
--/* Line 1455 of yacc.c */
--#line 11398 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11398 "sql/sql_yacc.yy"
- { }
- break;
-
- case 1729:
-
--/* Line 1455 of yacc.c */
--#line 11399 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11399 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_MASTER; }
- break;
-
- case 1730:
-
--/* Line 1455 of yacc.c */
--#line 11400 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11400 "sql/sql_yacc.yy"
- { Lex->type|= REFRESH_QUERY_CACHE;}
- break;
-
- case 1731:
-
--/* Line 1455 of yacc.c */
--#line 11404 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11404 "sql/sql_yacc.yy"
- { Lex->reset_slave_info.all= false; }
- break;
-
- case 1732:
-
--/* Line 1455 of yacc.c */
--#line 11405 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11405 "sql/sql_yacc.yy"
- { Lex->reset_slave_info.all= true; }
- break;
-
- case 1733:
-
--/* Line 1455 of yacc.c */
--#line 11410 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11410 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->type=0;
-@@ -31534,15 +31564,15 @@
-
- case 1734:
-
--/* Line 1455 of yacc.c */
--#line 11416 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11416 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1736:
-
--/* Line 1455 of yacc.c */
--#line 11425 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11425 "sql/sql_yacc.yy"
- {
- Lex->to_log = (yyvsp[(2) - (2)].lex_str).str;
- }
-@@ -31550,8 +31580,8 @@
-
- case 1737:
-
--/* Line 1455 of yacc.c */
--#line 11429 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11429 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->value_list.empty();
-@@ -31562,8 +31592,8 @@
-
- case 1738:
-
--/* Line 1455 of yacc.c */
--#line 11441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11441 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->value_list.empty();
-@@ -31574,29 +31604,29 @@
-
- case 1739:
-
--/* Line 1455 of yacc.c */
--#line 11450 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11450 "sql/sql_yacc.yy"
- { Lex->type= 0; }
- break;
-
- case 1740:
-
--/* Line 1455 of yacc.c */
--#line 11451 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11451 "sql/sql_yacc.yy"
- { Lex->type= 0; }
- break;
-
- case 1741:
-
--/* Line 1455 of yacc.c */
--#line 11452 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11452 "sql/sql_yacc.yy"
- { Lex->type= ONLY_KILL_QUERY; }
- break;
-
- case 1742:
-
--/* Line 1455 of yacc.c */
--#line 11459 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11459 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command=SQLCOM_CHANGE_DB;
-@@ -31606,8 +31636,8 @@
-
- case 1743:
-
--/* Line 1455 of yacc.c */
--#line 11470 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11470 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -31623,8 +31653,8 @@
-
- case 1744:
-
--/* Line 1455 of yacc.c */
--#line 11482 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11482 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_LOAD;
-@@ -31638,8 +31668,8 @@
-
- case 1745:
-
--/* Line 1455 of yacc.c */
--#line 11492 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11492 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!Select->add_table_to_list(YYTHD, (yyvsp[(12) - (12)].table), NULL, TL_OPTION_UPDATING,
-@@ -31653,57 +31683,57 @@
-
- case 1746:
-
--/* Line 1455 of yacc.c */
--#line 11502 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11502 "sql/sql_yacc.yy"
- { Lex->exchange->cs= (yyvsp[(14) - (14)].charset); }
- break;
-
- case 1747:
-
--/* Line 1455 of yacc.c */
--#line 11506 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11506 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1748:
-
--/* Line 1455 of yacc.c */
--#line 11510 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11510 "sql/sql_yacc.yy"
- { (yyval.filetype)= FILETYPE_CSV; }
- break;
-
- case 1749:
-
--/* Line 1455 of yacc.c */
--#line 11511 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11511 "sql/sql_yacc.yy"
- { (yyval.filetype)= FILETYPE_XML; }
- break;
-
- case 1750:
-
--/* Line 1455 of yacc.c */
--#line 11515 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11515 "sql/sql_yacc.yy"
- { (yyval.num)=0;}
- break;
-
- case 1751:
-
--/* Line 1455 of yacc.c */
--#line 11516 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11516 "sql/sql_yacc.yy"
- { (yyval.num)=1;}
- break;
-
- case 1752:
-
--/* Line 1455 of yacc.c */
--#line 11520 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11520 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE_DEFAULT; }
- break;
-
- case 1753:
-
--/* Line 1455 of yacc.c */
--#line 11522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11522 "sql/sql_yacc.yy"
- {
- #ifdef HAVE_QUERY_CACHE
- /*
-@@ -31719,36 +31749,36 @@
-
- case 1754:
-
--/* Line 1455 of yacc.c */
--#line 11533 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11533 "sql/sql_yacc.yy"
- { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
- break;
-
- case 1755:
-
--/* Line 1455 of yacc.c */
--#line 11537 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11537 "sql/sql_yacc.yy"
- { Lex->duplicates=DUP_ERROR; }
- break;
-
- case 1756:
-
--/* Line 1455 of yacc.c */
--#line 11538 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11538 "sql/sql_yacc.yy"
- { Lex->duplicates=DUP_REPLACE; }
- break;
-
- case 1757:
-
--/* Line 1455 of yacc.c */
--#line 11539 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11539 "sql/sql_yacc.yy"
- { Lex->ignore= 1; }
- break;
-
- case 1762:
-
--/* Line 1455 of yacc.c */
--#line 11554 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11554 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->field_term= (yyvsp[(3) - (3)].string);
-@@ -31757,8 +31787,8 @@
-
- case 1763:
-
--/* Line 1455 of yacc.c */
--#line 11559 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11559 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- DBUG_ASSERT(lex->exchange != 0);
-@@ -31769,8 +31799,8 @@
-
- case 1764:
-
--/* Line 1455 of yacc.c */
--#line 11566 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11566 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->enclosed= (yyvsp[(3) - (3)].string);
-@@ -31779,8 +31809,8 @@
-
- case 1765:
-
--/* Line 1455 of yacc.c */
--#line 11571 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11571 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->escaped= (yyvsp[(3) - (3)].string);
-@@ -31789,8 +31819,8 @@
-
- case 1770:
-
--/* Line 1455 of yacc.c */
--#line 11589 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11589 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->line_term= (yyvsp[(3) - (3)].string);
-@@ -31799,8 +31829,8 @@
-
- case 1771:
-
--/* Line 1455 of yacc.c */
--#line 11594 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11594 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->line_start= (yyvsp[(3) - (3)].string);
-@@ -31809,22 +31839,22 @@
-
- case 1772:
-
--/* Line 1455 of yacc.c */
--#line 11601 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11601 "sql/sql_yacc.yy"
- { }
- break;
-
- case 1773:
-
--/* Line 1455 of yacc.c */
--#line 11603 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11603 "sql/sql_yacc.yy"
- { Lex->exchange->line_term = (yyvsp[(4) - (4)].string); }
- break;
-
- case 1775:
-
--/* Line 1455 of yacc.c */
--#line 11608 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11608 "sql/sql_yacc.yy"
- {
- DBUG_ASSERT(Lex->exchange != 0);
- Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str);
-@@ -31833,64 +31863,64 @@
-
- case 1776:
-
--/* Line 1455 of yacc.c */
--#line 11615 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11615 "sql/sql_yacc.yy"
- { }
- break;
-
- case 1777:
-
--/* Line 1455 of yacc.c */
--#line 11617 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11617 "sql/sql_yacc.yy"
- { }
- break;
-
- case 1778:
-
--/* Line 1455 of yacc.c */
--#line 11621 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11621 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1779:
-
--/* Line 1455 of yacc.c */
--#line 11622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11622 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1780:
-
--/* Line 1455 of yacc.c */
--#line 11623 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11623 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1781:
-
--/* Line 1455 of yacc.c */
--#line 11628 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11628 "sql/sql_yacc.yy"
- { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
- break;
-
- case 1782:
-
--/* Line 1455 of yacc.c */
--#line 11630 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11630 "sql/sql_yacc.yy"
- { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
- break;
-
- case 1783:
-
--/* Line 1455 of yacc.c */
--#line 11634 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11634 "sql/sql_yacc.yy"
- {(yyval.item)= (yyvsp[(1) - (1)].item);}
- break;
-
- case 1784:
-
--/* Line 1455 of yacc.c */
--#line 11636 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11636 "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)
-@@ -31900,35 +31930,35 @@
-
- case 1785:
-
--/* Line 1455 of yacc.c */
--#line 11644 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11644 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1786:
-
--/* Line 1455 of yacc.c */
--#line 11645 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11645 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1789:
-
--/* Line 1455 of yacc.c */
--#line 11655 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11655 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->update_list.push_back((yyvsp[(1) - (5)].item)) ||
- lex->value_list.push_back((yyvsp[(4) - (5)].item)))
- MYSQL_YYABORT;
-- (yyvsp[(4) - (5)].item)->set_name((yyvsp[(3) - (5)].simple_string), (uint) ((yyvsp[(5) - (5)].simple_string) - (yyvsp[(3) - (5)].simple_string)), YYTHD->charset());
-+ (yyvsp[(4) - (5)].item)->set_name_no_truncate((yyvsp[(3) - (5)].simple_string), (uint) ((yyvsp[(5) - (5)].simple_string) - (yyvsp[(3) - (5)].simple_string)), YYTHD->charset());
- }
- break;
-
- case 1790:
-
--/* Line 1455 of yacc.c */
--#line 11668 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11668 "sql/sql_yacc.yy"
- {
- LEX_STRING tmp;
- THD *thd= YYTHD;
-@@ -31956,8 +31986,8 @@
-
- case 1791:
-
--/* Line 1455 of yacc.c */
--#line 11692 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11692 "sql/sql_yacc.yy"
- {
- uint repertoire= Lex->text_string_is_7bit ?
- MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
-@@ -31973,8 +32003,8 @@
-
- case 1792:
-
--/* Line 1455 of yacc.c */
--#line 11704 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11704 "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));
-@@ -31989,8 +32019,8 @@
-
- case 1793:
-
--/* Line 1455 of yacc.c */
--#line 11715 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11715 "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);
-@@ -32010,8 +32040,8 @@
-
- case 1794:
-
--/* Line 1455 of yacc.c */
--#line 11734 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11734 "sql/sql_yacc.yy"
- {
- (yyval.string)= new (YYTHD->mem_root) String((yyvsp[(1) - (1)].lex_str).str,
- (yyvsp[(1) - (1)].lex_str).length,
-@@ -32023,8 +32053,8 @@
-
- case 1795:
-
--/* Line 1455 of yacc.c */
--#line 11742 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11742 "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)
-@@ -32040,8 +32070,8 @@
-
- case 1796:
-
--/* Line 1455 of yacc.c */
--#line 11754 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11754 "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)
-@@ -32057,8 +32087,8 @@
-
- case 1797:
-
--/* Line 1455 of yacc.c */
--#line 11769 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11769 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -32080,22 +32110,22 @@
-
- case 1798:
-
--/* Line 1455 of yacc.c */
--#line 11789 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11789 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(1) - (1)].item); }
- break;
-
- case 1799:
-
--/* Line 1455 of yacc.c */
--#line 11790 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11790 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(2) - (2)].item_num); }
- break;
-
- case 1800:
-
--/* Line 1455 of yacc.c */
--#line 11792 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11792 "sql/sql_yacc.yy"
- {
- (yyvsp[(2) - (2)].item_num)->max_length++;
- (yyval.item)= (yyvsp[(2) - (2)].item_num)->neg();
-@@ -32104,22 +32134,22 @@
-
- case 1801:
-
--/* Line 1455 of yacc.c */
--#line 11799 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11799 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(1) - (1)].item); }
- break;
-
- case 1802:
-
--/* Line 1455 of yacc.c */
--#line 11800 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11800 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(1) - (1)].item_num); }
- break;
-
- case 1803:
-
--/* Line 1455 of yacc.c */
--#line 11802 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11802 "sql/sql_yacc.yy"
- {
- (yyval.item) = new (YYTHD->mem_root) Item_null();
- if ((yyval.item) == NULL)
-@@ -32130,8 +32160,8 @@
-
- case 1804:
-
--/* Line 1455 of yacc.c */
--#line 11809 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11809 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1);
- if ((yyval.item) == NULL)
-@@ -32141,8 +32171,8 @@
-
- case 1805:
-
--/* Line 1455 of yacc.c */
--#line 11815 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11815 "sql/sql_yacc.yy"
- {
- (yyval.item)= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1);
- if ((yyval.item) == NULL)
-@@ -32152,8 +32182,8 @@
-
- case 1806:
-
--/* Line 1455 of yacc.c */
--#line 11821 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11821 "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)
-@@ -32163,8 +32193,8 @@
-
- case 1807:
-
--/* Line 1455 of yacc.c */
--#line 11827 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11827 "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)
-@@ -32174,8 +32204,8 @@
-
- case 1808:
-
--/* Line 1455 of yacc.c */
--#line 11833 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11833 "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)
-@@ -32208,8 +32238,8 @@
-
- case 1809:
-
--/* Line 1455 of yacc.c */
--#line 11862 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11862 "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)
-@@ -32241,29 +32271,29 @@
-
- case 1810:
-
--/* Line 1455 of yacc.c */
--#line 11889 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11889 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(2) - (2)].item); }
- break;
-
- case 1811:
-
--/* Line 1455 of yacc.c */
--#line 11890 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11890 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(2) - (2)].item); }
- break;
-
- case 1812:
-
--/* Line 1455 of yacc.c */
--#line 11891 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11891 "sql/sql_yacc.yy"
- { (yyval.item) = (yyvsp[(2) - (2)].item); }
- break;
-
- case 1813:
-
--/* Line 1455 of yacc.c */
--#line 11896 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11896 "sql/sql_yacc.yy"
- {
- int error;
- (yyval.item_num)= new (YYTHD->mem_root)
-@@ -32277,8 +32307,8 @@
-
- case 1814:
-
--/* Line 1455 of yacc.c */
--#line 11906 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11906 "sql/sql_yacc.yy"
- {
- int error;
- (yyval.item_num)= new (YYTHD->mem_root)
-@@ -32292,8 +32322,8 @@
-
- case 1815:
-
--/* Line 1455 of yacc.c */
--#line 11916 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11916 "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)
-@@ -32303,8 +32333,8 @@
-
- case 1816:
-
--/* Line 1455 of yacc.c */
--#line 11922 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11922 "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());
-@@ -32317,8 +32347,8 @@
-
- case 1817:
-
--/* Line 1455 of yacc.c */
--#line 11931 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11931 "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()))
-@@ -32330,22 +32360,22 @@
-
- case 1818:
-
--/* Line 1455 of yacc.c */
--#line 11945 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11945 "sql/sql_yacc.yy"
- { (yyval.item)=(yyvsp[(1) - (1)].item); }
- break;
-
- case 1819:
-
--/* Line 1455 of yacc.c */
--#line 11946 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11946 "sql/sql_yacc.yy"
- { (yyval.item)=(yyvsp[(1) - (1)].item); }
- break;
-
- case 1820:
-
--/* Line 1455 of yacc.c */
--#line 11951 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11951 "sql/sql_yacc.yy"
- {
- SELECT_LEX *sel= Select;
- (yyval.item)= new (YYTHD->mem_root) Item_field(Lex->current_context(),
-@@ -32358,8 +32388,8 @@
-
- case 1821:
-
--/* Line 1455 of yacc.c */
--#line 11960 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11960 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- SELECT_LEX *sel= Select;
-@@ -32376,15 +32406,15 @@
-
- case 1822:
-
--/* Line 1455 of yacc.c */
--#line 11975 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11975 "sql/sql_yacc.yy"
- { (yyval.item)=(yyvsp[(1) - (1)].item); }
- break;
-
- case 1823:
-
--/* Line 1455 of yacc.c */
--#line 11980 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 11980 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -32435,15 +32465,15 @@
-
- case 1824:
-
--/* Line 1455 of yacc.c */
--#line 12026 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12026 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item); }
- break;
-
- case 1825:
-
--/* Line 1455 of yacc.c */
--#line 12031 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12031 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- SELECT_LEX *sel=Select;
-@@ -32465,15 +32495,15 @@
-
- case 1826:
-
--/* Line 1455 of yacc.c */
--#line 12048 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12048 "sql/sql_yacc.yy"
- { (yyval.item)= (yyvsp[(1) - (1)].item); }
- break;
-
- case 1827:
-
--/* Line 1455 of yacc.c */
--#line 12053 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12053 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -32556,8 +32586,8 @@
-
- case 1828:
-
--/* Line 1455 of yacc.c */
--#line 12132 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12132 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -32586,8 +32616,8 @@
-
- case 1829:
-
--/* Line 1455 of yacc.c */
--#line 12157 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12157 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -32619,15 +32649,15 @@
-
- case 1830:
-
--/* Line 1455 of yacc.c */
--#line 12187 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12187 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
- break;
-
- case 1831:
-
--/* Line 1455 of yacc.c */
--#line 12189 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12189 "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))
-@@ -32647,8 +32677,8 @@
-
- case 1832:
-
--/* Line 1455 of yacc.c */
--#line 12205 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12205 "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))
-@@ -32662,15 +32692,15 @@
-
- case 1833:
-
--/* Line 1455 of yacc.c */
--#line 12214 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12214 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);}
- break;
-
- case 1834:
-
--/* Line 1455 of yacc.c */
--#line 12219 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12219 "sql/sql_yacc.yy"
- {
- (yyval.table)= new Table_ident((yyvsp[(1) - (1)].lex_str));
- if ((yyval.table) == NULL)
-@@ -32680,8 +32710,8 @@
-
- case 1835:
-
--/* Line 1455 of yacc.c */
--#line 12225 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12225 "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)
-@@ -32691,8 +32721,8 @@
-
- case 1836:
-
--/* Line 1455 of yacc.c */
--#line 12231 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12231 "sql/sql_yacc.yy"
- {
- /* For Delphi */
- (yyval.table)= new Table_ident((yyvsp[(2) - (2)].lex_str));
-@@ -32703,8 +32733,8 @@
-
- case 1837:
-
--/* Line 1455 of yacc.c */
--#line 12241 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12241 "sql/sql_yacc.yy"
- {
- (yyval.table)= new Table_ident((yyvsp[(1) - (2)].lex_str));
- if ((yyval.table) == NULL)
-@@ -32714,8 +32744,8 @@
-
- case 1838:
-
--/* Line 1455 of yacc.c */
--#line 12247 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12247 "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)
-@@ -32725,8 +32755,8 @@
-
- case 1839:
-
--/* Line 1455 of yacc.c */
--#line 12256 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12256 "sql/sql_yacc.yy"
- {
- LEX_STRING db={(char*) any_db,3};
- (yyval.table)= new Table_ident(YYTHD, db,(yyvsp[(1) - (1)].lex_str),0);
-@@ -32737,15 +32767,15 @@
-
- case 1840:
-
--/* Line 1455 of yacc.c */
--#line 12265 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12265 "sql/sql_yacc.yy"
- { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 1841:
-
--/* Line 1455 of yacc.c */
--#line 12267 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12267 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -32776,8 +32806,8 @@
-
- case 1842:
-
--/* Line 1455 of yacc.c */
--#line 12297 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12297 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -32794,8 +32824,8 @@
-
- case 1843:
-
--/* Line 1455 of yacc.c */
--#line 12313 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12313 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -32812,8 +32842,8 @@
-
- case 1844:
-
--/* Line 1455 of yacc.c */
--#line 12329 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12329 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
-
-@@ -32831,15 +32861,15 @@
-
- case 1845:
-
--/* Line 1455 of yacc.c */
--#line 12345 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12345 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 1846:
-
--/* Line 1455 of yacc.c */
--#line 12347 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12347 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
-@@ -32851,15 +32881,15 @@
-
- case 1847:
-
--/* Line 1455 of yacc.c */
--#line 12357 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12357 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
- break;
-
- case 1848:
-
--/* Line 1455 of yacc.c */
--#line 12359 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12359 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
-@@ -32871,29 +32901,29 @@
-
- case 1849:
-
--/* Line 1455 of yacc.c */
--#line 12369 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12369 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
- break;
-
- case 1850:
-
--/* Line 1455 of yacc.c */
--#line 12370 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12370 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
- break;
-
- case 1851:
-
--/* Line 1455 of yacc.c */
--#line 12371 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12371 "sql/sql_yacc.yy"
- { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
- break;
-
- case 1852:
-
--/* Line 1455 of yacc.c */
--#line 12376 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12376 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
-@@ -32914,8 +32944,8 @@
-
- case 1853:
-
--/* Line 1455 of yacc.c */
--#line 12393 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12393 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
-@@ -32941,8 +32971,8 @@
-
- case 1854:
-
--/* Line 1455 of yacc.c */
--#line 12415 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12415 "sql/sql_yacc.yy"
- {
- if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
- MYSQL_YYABORT;
-@@ -32957,2304 +32987,2304 @@
-
- case 1855:
-
--/* Line 1455 of yacc.c */
--#line 12429 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12429 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1856:
-
--/* Line 1455 of yacc.c */
--#line 12430 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12430 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1857:
-
--/* Line 1455 of yacc.c */
--#line 12431 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12431 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1858:
-
--/* Line 1455 of yacc.c */
--#line 12432 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12432 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1859:
-
--/* Line 1455 of yacc.c */
--#line 12433 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12433 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1860:
-
--/* Line 1455 of yacc.c */
--#line 12434 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12434 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1861:
-
--/* Line 1455 of yacc.c */
--#line 12435 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12435 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1862:
-
--/* Line 1455 of yacc.c */
--#line 12436 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12436 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1863:
-
--/* Line 1455 of yacc.c */
--#line 12437 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12437 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1864:
-
--/* Line 1455 of yacc.c */
--#line 12438 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12438 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1865:
-
--/* Line 1455 of yacc.c */
--#line 12439 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12439 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1866:
-
--/* Line 1455 of yacc.c */
--#line 12440 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12440 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1867:
-
--/* Line 1455 of yacc.c */
--#line 12441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12441 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1868:
-
--/* Line 1455 of yacc.c */
--#line 12442 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12442 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1869:
-
--/* Line 1455 of yacc.c */
--#line 12443 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12443 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1870:
-
--/* Line 1455 of yacc.c */
--#line 12444 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12444 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1871:
-
--/* Line 1455 of yacc.c */
--#line 12445 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12445 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1872:
-
--/* Line 1455 of yacc.c */
--#line 12446 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12446 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1873:
-
--/* Line 1455 of yacc.c */
--#line 12447 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12447 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1874:
-
--/* Line 1455 of yacc.c */
--#line 12448 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12448 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1875:
-
--/* Line 1455 of yacc.c */
--#line 12449 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12449 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1876:
-
--/* Line 1455 of yacc.c */
--#line 12450 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12450 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1877:
-
--/* Line 1455 of yacc.c */
--#line 12451 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12451 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1878:
-
--/* Line 1455 of yacc.c */
--#line 12452 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12452 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1879:
-
--/* Line 1455 of yacc.c */
--#line 12453 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12453 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1880:
-
--/* Line 1455 of yacc.c */
--#line 12454 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12454 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1881:
-
--/* Line 1455 of yacc.c */
--#line 12455 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12455 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1882:
-
--/* Line 1455 of yacc.c */
--#line 12456 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12456 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1883:
-
--/* Line 1455 of yacc.c */
--#line 12457 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12457 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1884:
-
--/* Line 1455 of yacc.c */
--#line 12458 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12458 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1885:
-
--/* Line 1455 of yacc.c */
--#line 12459 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12459 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1886:
-
--/* Line 1455 of yacc.c */
--#line 12460 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12460 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1887:
-
--/* Line 1455 of yacc.c */
--#line 12461 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12461 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1888:
-
--/* Line 1455 of yacc.c */
--#line 12462 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12462 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1889:
-
--/* Line 1455 of yacc.c */
--#line 12463 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12463 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1890:
-
--/* Line 1455 of yacc.c */
--#line 12464 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12464 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1891:
-
--/* Line 1455 of yacc.c */
--#line 12465 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12465 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1892:
-
--/* Line 1455 of yacc.c */
--#line 12466 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12466 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1893:
-
--/* Line 1455 of yacc.c */
--#line 12467 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12467 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1894:
-
--/* Line 1455 of yacc.c */
--#line 12468 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12468 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1895:
-
--/* Line 1455 of yacc.c */
--#line 12469 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12469 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1896:
-
--/* Line 1455 of yacc.c */
--#line 12470 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12470 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1897:
-
--/* Line 1455 of yacc.c */
--#line 12471 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12471 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1898:
-
--/* Line 1455 of yacc.c */
--#line 12472 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12472 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1899:
-
--/* Line 1455 of yacc.c */
--#line 12473 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12473 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1900:
-
--/* Line 1455 of yacc.c */
--#line 12474 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12474 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1901:
-
--/* Line 1455 of yacc.c */
--#line 12475 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12475 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1902:
-
--/* Line 1455 of yacc.c */
--#line 12476 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12476 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1903:
-
--/* Line 1455 of yacc.c */
--#line 12477 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12477 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1904:
-
--/* Line 1455 of yacc.c */
--#line 12478 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12478 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1905:
-
--/* Line 1455 of yacc.c */
--#line 12488 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12488 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1906:
-
--/* Line 1455 of yacc.c */
--#line 12489 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12489 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1907:
-
--/* Line 1455 of yacc.c */
--#line 12490 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12490 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1908:
-
--/* Line 1455 of yacc.c */
--#line 12491 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12491 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1909:
-
--/* Line 1455 of yacc.c */
--#line 12492 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12492 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1910:
-
--/* Line 1455 of yacc.c */
--#line 12493 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12493 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1911:
-
--/* Line 1455 of yacc.c */
--#line 12494 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12494 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1912:
-
--/* Line 1455 of yacc.c */
--#line 12495 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12495 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1913:
-
--/* Line 1455 of yacc.c */
--#line 12496 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12496 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1914:
-
--/* Line 1455 of yacc.c */
--#line 12497 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12497 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1915:
-
--/* Line 1455 of yacc.c */
--#line 12498 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12498 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1916:
-
--/* Line 1455 of yacc.c */
--#line 12499 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12499 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1917:
-
--/* Line 1455 of yacc.c */
--#line 12500 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12500 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1918:
-
--/* Line 1455 of yacc.c */
--#line 12501 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12501 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1919:
-
--/* Line 1455 of yacc.c */
--#line 12502 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12502 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1920:
-
--/* Line 1455 of yacc.c */
--#line 12503 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12503 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1921:
-
--/* Line 1455 of yacc.c */
--#line 12504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12504 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1922:
-
--/* Line 1455 of yacc.c */
--#line 12505 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12505 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1923:
-
--/* Line 1455 of yacc.c */
--#line 12506 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12506 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1924:
-
--/* Line 1455 of yacc.c */
--#line 12507 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12507 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1925:
-
--/* Line 1455 of yacc.c */
--#line 12508 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12508 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1926:
-
--/* Line 1455 of yacc.c */
--#line 12509 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12509 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1927:
-
--/* Line 1455 of yacc.c */
--#line 12510 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12510 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1928:
-
--/* Line 1455 of yacc.c */
--#line 12511 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12511 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1929:
-
--/* Line 1455 of yacc.c */
--#line 12512 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12512 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1930:
-
--/* Line 1455 of yacc.c */
--#line 12513 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12513 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1931:
-
--/* Line 1455 of yacc.c */
--#line 12514 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12514 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1932:
-
--/* Line 1455 of yacc.c */
--#line 12515 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12515 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1933:
-
--/* Line 1455 of yacc.c */
--#line 12516 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12516 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1934:
-
--/* Line 1455 of yacc.c */
--#line 12517 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12517 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1935:
-
--/* Line 1455 of yacc.c */
--#line 12518 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12518 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1936:
-
--/* Line 1455 of yacc.c */
--#line 12519 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12519 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1937:
-
--/* Line 1455 of yacc.c */
--#line 12520 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12520 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1938:
-
--/* Line 1455 of yacc.c */
--#line 12521 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12521 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1939:
-
--/* Line 1455 of yacc.c */
--#line 12522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12522 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1940:
-
--/* Line 1455 of yacc.c */
--#line 12523 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12523 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1941:
-
--/* Line 1455 of yacc.c */
--#line 12524 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12524 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1942:
-
--/* Line 1455 of yacc.c */
--#line 12525 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12525 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1943:
-
--/* Line 1455 of yacc.c */
--#line 12526 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12526 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1944:
-
--/* Line 1455 of yacc.c */
--#line 12527 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12527 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1945:
-
--/* Line 1455 of yacc.c */
--#line 12528 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12528 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1946:
-
--/* Line 1455 of yacc.c */
--#line 12529 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12529 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1947:
-
--/* Line 1455 of yacc.c */
--#line 12530 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12530 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1948:
-
--/* Line 1455 of yacc.c */
--#line 12531 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12531 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1949:
-
--/* Line 1455 of yacc.c */
--#line 12532 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12532 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1950:
-
--/* Line 1455 of yacc.c */
--#line 12533 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12533 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1951:
-
--/* Line 1455 of yacc.c */
--#line 12534 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12534 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1952:
-
--/* Line 1455 of yacc.c */
--#line 12535 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12535 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1953:
-
--/* Line 1455 of yacc.c */
--#line 12536 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12536 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1954:
-
--/* Line 1455 of yacc.c */
--#line 12537 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12537 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1955:
-
--/* Line 1455 of yacc.c */
--#line 12538 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12538 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1956:
-
--/* Line 1455 of yacc.c */
--#line 12539 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12539 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1957:
-
--/* Line 1455 of yacc.c */
--#line 12540 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12540 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1958:
-
--/* Line 1455 of yacc.c */
--#line 12541 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12541 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1959:
-
--/* Line 1455 of yacc.c */
--#line 12542 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12542 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1960:
-
--/* Line 1455 of yacc.c */
--#line 12543 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12543 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1961:
-
--/* Line 1455 of yacc.c */
--#line 12544 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12544 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1962:
-
--/* Line 1455 of yacc.c */
--#line 12545 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12545 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1963:
-
--/* Line 1455 of yacc.c */
--#line 12546 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12546 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1964:
-
--/* Line 1455 of yacc.c */
--#line 12547 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12547 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1965:
-
--/* Line 1455 of yacc.c */
--#line 12548 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12548 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1966:
-
--/* Line 1455 of yacc.c */
--#line 12549 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12549 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1967:
-
--/* Line 1455 of yacc.c */
--#line 12550 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12550 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1968:
-
--/* Line 1455 of yacc.c */
--#line 12551 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12551 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1969:
-
--/* Line 1455 of yacc.c */
--#line 12552 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12552 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1970:
-
--/* Line 1455 of yacc.c */
--#line 12553 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12553 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1971:
-
--/* Line 1455 of yacc.c */
--#line 12554 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12554 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1972:
-
--/* Line 1455 of yacc.c */
--#line 12555 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12555 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1973:
-
--/* Line 1455 of yacc.c */
--#line 12556 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12556 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1974:
-
--/* Line 1455 of yacc.c */
--#line 12557 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12557 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1975:
-
--/* Line 1455 of yacc.c */
--#line 12558 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12558 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1976:
-
--/* Line 1455 of yacc.c */
--#line 12559 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12559 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1977:
-
--/* Line 1455 of yacc.c */
--#line 12560 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12560 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1978:
-
--/* Line 1455 of yacc.c */
--#line 12561 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12561 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1979:
-
--/* Line 1455 of yacc.c */
--#line 12562 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12562 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1980:
-
--/* Line 1455 of yacc.c */
--#line 12563 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12563 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1981:
-
--/* Line 1455 of yacc.c */
--#line 12564 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12564 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1982:
-
--/* Line 1455 of yacc.c */
--#line 12565 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12565 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1983:
-
--/* Line 1455 of yacc.c */
--#line 12566 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12566 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1984:
-
--/* Line 1455 of yacc.c */
--#line 12567 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12567 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1985:
-
--/* Line 1455 of yacc.c */
--#line 12568 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12568 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1986:
-
--/* Line 1455 of yacc.c */
--#line 12569 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12569 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1987:
-
--/* Line 1455 of yacc.c */
--#line 12570 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12570 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1988:
-
--/* Line 1455 of yacc.c */
--#line 12571 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12571 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1989:
-
--/* Line 1455 of yacc.c */
--#line 12572 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12572 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1990:
-
--/* Line 1455 of yacc.c */
--#line 12573 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12573 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1991:
-
--/* Line 1455 of yacc.c */
--#line 12574 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12574 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1992:
-
--/* Line 1455 of yacc.c */
--#line 12575 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12575 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1993:
-
--/* Line 1455 of yacc.c */
--#line 12576 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12576 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1994:
-
--/* Line 1455 of yacc.c */
--#line 12577 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12577 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1995:
-
--/* Line 1455 of yacc.c */
--#line 12578 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12578 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1996:
-
--/* Line 1455 of yacc.c */
--#line 12579 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12579 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1997:
-
--/* Line 1455 of yacc.c */
--#line 12580 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12580 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1998:
-
--/* Line 1455 of yacc.c */
--#line 12581 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12581 "sql/sql_yacc.yy"
- {}
- break;
-
- case 1999:
-
--/* Line 1455 of yacc.c */
--#line 12582 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12582 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2000:
-
--/* Line 1455 of yacc.c */
--#line 12583 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12583 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2001:
-
--/* Line 1455 of yacc.c */
--#line 12584 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12584 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2002:
-
--/* Line 1455 of yacc.c */
--#line 12585 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12585 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2003:
-
--/* Line 1455 of yacc.c */
--#line 12586 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12586 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2004:
-
--/* Line 1455 of yacc.c */
--#line 12587 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12587 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2005:
-
--/* Line 1455 of yacc.c */
--#line 12588 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12588 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2006:
-
--/* Line 1455 of yacc.c */
--#line 12589 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12589 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2007:
-
--/* Line 1455 of yacc.c */
--#line 12590 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12590 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2008:
-
--/* Line 1455 of yacc.c */
--#line 12591 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12591 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2009:
-
--/* Line 1455 of yacc.c */
--#line 12592 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12592 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2010:
-
--/* Line 1455 of yacc.c */
--#line 12593 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12593 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2011:
-
--/* Line 1455 of yacc.c */
--#line 12594 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12594 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2012:
-
--/* Line 1455 of yacc.c */
--#line 12595 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12595 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2013:
-
--/* Line 1455 of yacc.c */
--#line 12596 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12596 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2014:
-
--/* Line 1455 of yacc.c */
--#line 12597 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12597 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2015:
-
--/* Line 1455 of yacc.c */
--#line 12598 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12598 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2016:
-
--/* Line 1455 of yacc.c */
--#line 12599 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12599 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2017:
-
--/* Line 1455 of yacc.c */
--#line 12600 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12600 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2018:
-
--/* Line 1455 of yacc.c */
--#line 12601 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12601 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2019:
-
--/* Line 1455 of yacc.c */
--#line 12602 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12602 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2020:
-
--/* Line 1455 of yacc.c */
--#line 12603 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12603 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2021:
-
--/* Line 1455 of yacc.c */
--#line 12604 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12604 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2022:
-
--/* Line 1455 of yacc.c */
--#line 12605 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12605 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2023:
-
--/* Line 1455 of yacc.c */
--#line 12606 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12606 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2024:
-
--/* Line 1455 of yacc.c */
--#line 12607 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12607 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2025:
-
--/* Line 1455 of yacc.c */
--#line 12608 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12608 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2026:
-
--/* Line 1455 of yacc.c */
--#line 12609 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12609 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2027:
-
--/* Line 1455 of yacc.c */
--#line 12610 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12610 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2028:
-
--/* Line 1455 of yacc.c */
--#line 12611 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12611 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2029:
-
--/* Line 1455 of yacc.c */
--#line 12612 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12612 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2030:
-
--/* Line 1455 of yacc.c */
--#line 12613 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12613 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2031:
-
--/* Line 1455 of yacc.c */
--#line 12614 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12614 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2032:
-
--/* Line 1455 of yacc.c */
--#line 12615 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12615 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2033:
-
--/* Line 1455 of yacc.c */
--#line 12616 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12616 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2034:
-
--/* Line 1455 of yacc.c */
--#line 12617 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12617 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2035:
-
--/* Line 1455 of yacc.c */
--#line 12618 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12618 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2036:
-
--/* Line 1455 of yacc.c */
--#line 12619 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12619 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2037:
-
--/* Line 1455 of yacc.c */
--#line 12620 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12620 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2038:
-
--/* Line 1455 of yacc.c */
--#line 12621 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12621 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2039:
-
--/* Line 1455 of yacc.c */
--#line 12622 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12622 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2040:
-
--/* Line 1455 of yacc.c */
--#line 12623 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12623 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2041:
-
--/* Line 1455 of yacc.c */
--#line 12624 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12624 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2042:
-
--/* Line 1455 of yacc.c */
--#line 12625 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12625 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2043:
-
--/* Line 1455 of yacc.c */
--#line 12626 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12626 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2044:
-
--/* Line 1455 of yacc.c */
--#line 12627 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12627 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2045:
-
--/* Line 1455 of yacc.c */
--#line 12628 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12628 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2046:
-
--/* Line 1455 of yacc.c */
--#line 12629 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12629 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2047:
-
--/* Line 1455 of yacc.c */
--#line 12630 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12630 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2048:
-
--/* Line 1455 of yacc.c */
--#line 12631 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12631 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2049:
-
--/* Line 1455 of yacc.c */
--#line 12632 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12632 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2050:
-
--/* Line 1455 of yacc.c */
--#line 12633 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12633 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2051:
-
--/* Line 1455 of yacc.c */
--#line 12634 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12634 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2052:
-
--/* Line 1455 of yacc.c */
--#line 12635 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12635 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2053:
-
--/* Line 1455 of yacc.c */
--#line 12636 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12636 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2054:
-
--/* Line 1455 of yacc.c */
--#line 12637 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12637 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2055:
-
--/* Line 1455 of yacc.c */
--#line 12638 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12638 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2056:
-
--/* Line 1455 of yacc.c */
--#line 12639 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12639 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2057:
-
--/* Line 1455 of yacc.c */
--#line 12640 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12640 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2058:
-
--/* Line 1455 of yacc.c */
--#line 12641 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12641 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2059:
-
--/* Line 1455 of yacc.c */
--#line 12642 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12642 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2060:
-
--/* Line 1455 of yacc.c */
--#line 12643 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12643 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2061:
-
--/* Line 1455 of yacc.c */
--#line 12644 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12644 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2062:
-
--/* Line 1455 of yacc.c */
--#line 12645 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12645 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2063:
-
--/* Line 1455 of yacc.c */
--#line 12646 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12646 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2064:
-
--/* Line 1455 of yacc.c */
--#line 12647 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12647 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2065:
-
--/* Line 1455 of yacc.c */
--#line 12648 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12648 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2066:
-
--/* Line 1455 of yacc.c */
--#line 12649 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12649 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2067:
-
--/* Line 1455 of yacc.c */
--#line 12650 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12650 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2068:
-
--/* Line 1455 of yacc.c */
--#line 12651 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12651 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2069:
-
--/* Line 1455 of yacc.c */
--#line 12652 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12652 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2070:
-
--/* Line 1455 of yacc.c */
--#line 12653 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12653 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2071:
-
--/* Line 1455 of yacc.c */
--#line 12654 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12654 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2072:
-
--/* Line 1455 of yacc.c */
--#line 12655 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12655 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2073:
-
--/* Line 1455 of yacc.c */
--#line 12656 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12656 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2074:
-
--/* Line 1455 of yacc.c */
--#line 12657 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12657 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2075:
-
--/* Line 1455 of yacc.c */
--#line 12658 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12658 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2076:
-
--/* Line 1455 of yacc.c */
--#line 12659 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12659 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2077:
-
--/* Line 1455 of yacc.c */
--#line 12660 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12660 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2078:
-
--/* Line 1455 of yacc.c */
--#line 12661 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12661 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2079:
-
--/* Line 1455 of yacc.c */
--#line 12662 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12662 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2080:
-
--/* Line 1455 of yacc.c */
--#line 12663 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12663 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2081:
-
--/* Line 1455 of yacc.c */
--#line 12664 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12664 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2082:
-
--/* Line 1455 of yacc.c */
--#line 12665 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12665 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2083:
-
--/* Line 1455 of yacc.c */
--#line 12666 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12666 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2084:
-
--/* Line 1455 of yacc.c */
--#line 12667 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12667 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2085:
-
--/* Line 1455 of yacc.c */
--#line 12668 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12668 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2086:
-
--/* Line 1455 of yacc.c */
--#line 12669 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12669 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2087:
-
--/* Line 1455 of yacc.c */
--#line 12670 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12670 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2088:
-
--/* Line 1455 of yacc.c */
--#line 12671 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12671 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2089:
-
--/* Line 1455 of yacc.c */
--#line 12672 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12672 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2090:
-
--/* Line 1455 of yacc.c */
--#line 12673 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12673 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2091:
-
--/* Line 1455 of yacc.c */
--#line 12674 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12674 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2092:
-
--/* Line 1455 of yacc.c */
--#line 12675 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12675 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2093:
-
--/* Line 1455 of yacc.c */
--#line 12676 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12676 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2094:
-
--/* Line 1455 of yacc.c */
--#line 12677 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12677 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2095:
-
--/* Line 1455 of yacc.c */
--#line 12678 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12678 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2096:
-
--/* Line 1455 of yacc.c */
--#line 12679 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12679 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2097:
-
--/* Line 1455 of yacc.c */
--#line 12680 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12680 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2098:
-
--/* Line 1455 of yacc.c */
--#line 12681 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12681 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2099:
-
--/* Line 1455 of yacc.c */
--#line 12682 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12682 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2100:
-
--/* Line 1455 of yacc.c */
--#line 12683 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12683 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2101:
-
--/* Line 1455 of yacc.c */
--#line 12684 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12684 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2102:
-
--/* Line 1455 of yacc.c */
--#line 12685 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12685 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2103:
-
--/* Line 1455 of yacc.c */
--#line 12686 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12686 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2104:
-
--/* Line 1455 of yacc.c */
--#line 12687 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12687 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2105:
-
--/* Line 1455 of yacc.c */
--#line 12688 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12688 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2106:
-
--/* Line 1455 of yacc.c */
--#line 12689 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12689 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2107:
-
--/* Line 1455 of yacc.c */
--#line 12690 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12690 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2108:
-
--/* Line 1455 of yacc.c */
--#line 12691 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12691 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2109:
-
--/* Line 1455 of yacc.c */
--#line 12692 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12692 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2110:
-
--/* Line 1455 of yacc.c */
--#line 12693 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12693 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2111:
-
--/* Line 1455 of yacc.c */
--#line 12694 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12694 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2112:
-
--/* Line 1455 of yacc.c */
--#line 12695 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12695 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2113:
-
--/* Line 1455 of yacc.c */
--#line 12696 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12696 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2114:
-
--/* Line 1455 of yacc.c */
--#line 12697 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12697 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2115:
-
--/* Line 1455 of yacc.c */
--#line 12698 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12698 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2116:
-
--/* Line 1455 of yacc.c */
--#line 12699 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12699 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2117:
-
--/* Line 1455 of yacc.c */
--#line 12700 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12700 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2118:
-
--/* Line 1455 of yacc.c */
--#line 12701 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12701 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2119:
-
--/* Line 1455 of yacc.c */
--#line 12702 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12702 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2120:
-
--/* Line 1455 of yacc.c */
--#line 12703 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12703 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2121:
-
--/* Line 1455 of yacc.c */
--#line 12704 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12704 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2122:
-
--/* Line 1455 of yacc.c */
--#line 12705 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12705 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2123:
-
--/* Line 1455 of yacc.c */
--#line 12706 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12706 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2124:
-
--/* Line 1455 of yacc.c */
--#line 12707 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12707 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2125:
-
--/* Line 1455 of yacc.c */
--#line 12708 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12708 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2126:
-
--/* Line 1455 of yacc.c */
--#line 12709 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12709 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2127:
-
--/* Line 1455 of yacc.c */
--#line 12710 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12710 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2128:
-
--/* Line 1455 of yacc.c */
--#line 12711 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12711 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2129:
-
--/* Line 1455 of yacc.c */
--#line 12712 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12712 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2130:
-
--/* Line 1455 of yacc.c */
--#line 12713 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12713 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2131:
-
--/* Line 1455 of yacc.c */
--#line 12714 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12714 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2132:
-
--/* Line 1455 of yacc.c */
--#line 12715 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12715 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2133:
-
--/* Line 1455 of yacc.c */
--#line 12716 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12716 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2134:
-
--/* Line 1455 of yacc.c */
--#line 12717 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12717 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2135:
-
--/* Line 1455 of yacc.c */
--#line 12718 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12718 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2136:
-
--/* Line 1455 of yacc.c */
--#line 12719 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12719 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2137:
-
--/* Line 1455 of yacc.c */
--#line 12720 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12720 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2138:
-
--/* Line 1455 of yacc.c */
--#line 12721 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12721 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2139:
-
--/* Line 1455 of yacc.c */
--#line 12722 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12722 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2140:
-
--/* Line 1455 of yacc.c */
--#line 12723 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12723 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2141:
-
--/* Line 1455 of yacc.c */
--#line 12724 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12724 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2142:
-
--/* Line 1455 of yacc.c */
--#line 12725 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12725 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2143:
-
--/* Line 1455 of yacc.c */
--#line 12726 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12726 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2144:
-
--/* Line 1455 of yacc.c */
--#line 12727 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12727 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2145:
-
--/* Line 1455 of yacc.c */
--#line 12728 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12728 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2146:
-
--/* Line 1455 of yacc.c */
--#line 12729 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12729 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2147:
-
--/* Line 1455 of yacc.c */
--#line 12730 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12730 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2148:
-
--/* Line 1455 of yacc.c */
--#line 12731 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12731 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2149:
-
--/* Line 1455 of yacc.c */
--#line 12732 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12732 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2150:
-
--/* Line 1455 of yacc.c */
--#line 12733 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12733 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2151:
-
--/* Line 1455 of yacc.c */
--#line 12734 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12734 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2152:
-
--/* Line 1455 of yacc.c */
--#line 12735 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12735 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2153:
-
--/* Line 1455 of yacc.c */
--#line 12736 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12736 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2154:
-
--/* Line 1455 of yacc.c */
--#line 12737 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12737 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2155:
-
--/* Line 1455 of yacc.c */
--#line 12738 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12738 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2156:
-
--/* Line 1455 of yacc.c */
--#line 12739 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12739 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2157:
-
--/* Line 1455 of yacc.c */
--#line 12740 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12740 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2158:
-
--/* Line 1455 of yacc.c */
--#line 12741 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12741 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2159:
-
--/* Line 1455 of yacc.c */
--#line 12742 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12742 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2160:
-
--/* Line 1455 of yacc.c */
--#line 12743 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12743 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2161:
-
--/* Line 1455 of yacc.c */
--#line 12744 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12744 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2162:
-
--/* Line 1455 of yacc.c */
--#line 12745 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12745 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2163:
-
--/* Line 1455 of yacc.c */
--#line 12746 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12746 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2164:
-
--/* Line 1455 of yacc.c */
--#line 12747 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12747 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2165:
-
--/* Line 1455 of yacc.c */
--#line 12748 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12748 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2166:
-
--/* Line 1455 of yacc.c */
--#line 12749 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12749 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2167:
-
--/* Line 1455 of yacc.c */
--#line 12750 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12750 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2168:
-
--/* Line 1455 of yacc.c */
--#line 12751 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12751 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2169:
-
--/* Line 1455 of yacc.c */
--#line 12752 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12752 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2170:
-
--/* Line 1455 of yacc.c */
--#line 12753 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12753 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2171:
-
--/* Line 1455 of yacc.c */
--#line 12754 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12754 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2172:
-
--/* Line 1455 of yacc.c */
--#line 12755 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12755 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2173:
-
--/* Line 1455 of yacc.c */
--#line 12756 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12756 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2174:
-
--/* Line 1455 of yacc.c */
--#line 12757 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12757 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2175:
-
--/* Line 1455 of yacc.c */
--#line 12758 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12758 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2176:
-
--/* Line 1455 of yacc.c */
--#line 12759 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12759 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2177:
-
--/* Line 1455 of yacc.c */
--#line 12760 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12760 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2178:
-
--/* Line 1455 of yacc.c */
--#line 12761 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12761 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2179:
-
--/* Line 1455 of yacc.c */
--#line 12762 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12762 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2180:
-
--/* Line 1455 of yacc.c */
--#line 12763 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12763 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2181:
-
--/* Line 1455 of yacc.c */
--#line 12764 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12764 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2182:
-
--/* Line 1455 of yacc.c */
--#line 12765 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12765 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2183:
-
--/* Line 1455 of yacc.c */
--#line 12772 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12772 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SET_OPTION;
-@@ -35268,29 +35298,29 @@
-
- case 2184:
-
--/* Line 1455 of yacc.c */
--#line 12782 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12782 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2185:
-
--/* Line 1455 of yacc.c */
--#line 12786 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12786 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2186:
-
--/* Line 1455 of yacc.c */
--#line 12787 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12787 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2189:
-
--/* Line 1455 of yacc.c */
--#line 12796 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12796 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -35325,8 +35355,8 @@
-
- case 2190:
-
--/* Line 1455 of yacc.c */
--#line 12827 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12827 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -35379,106 +35409,106 @@
-
- case 2191:
-
--/* Line 1455 of yacc.c */
--#line 12878 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12878 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2192:
-
--/* Line 1455 of yacc.c */
--#line 12879 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12879 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_GLOBAL; }
- break;
-
- case 2193:
-
--/* Line 1455 of yacc.c */
--#line 12880 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12880 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2194:
-
--/* Line 1455 of yacc.c */
--#line 12881 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12881 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2195:
-
--/* Line 1455 of yacc.c */
--#line 12885 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12885 "sql/sql_yacc.yy"
- { (yyval.num)= OPT_DEFAULT; }
- break;
-
- case 2196:
-
--/* Line 1455 of yacc.c */
--#line 12886 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12886 "sql/sql_yacc.yy"
- { Lex->one_shot_set= 1; (yyval.num)= OPT_SESSION; }
- break;
-
- case 2197:
-
--/* Line 1455 of yacc.c */
--#line 12890 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12890 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2198:
-
--/* Line 1455 of yacc.c */
--#line 12891 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12891 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_GLOBAL; }
- break;
-
- case 2199:
-
--/* Line 1455 of yacc.c */
--#line 12892 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12892 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2200:
-
--/* Line 1455 of yacc.c */
--#line 12893 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12893 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2201:
-
--/* Line 1455 of yacc.c */
--#line 12897 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12897 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_DEFAULT; }
- break;
-
- case 2202:
-
--/* Line 1455 of yacc.c */
--#line 12898 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12898 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_GLOBAL; }
- break;
-
- case 2203:
-
--/* Line 1455 of yacc.c */
--#line 12899 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12899 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2204:
-
--/* Line 1455 of yacc.c */
--#line 12900 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12900 "sql/sql_yacc.yy"
- { (yyval.var_type)=OPT_SESSION; }
- break;
-
- case 2207:
-
--/* Line 1455 of yacc.c */
--#line 12910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12910 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= Lex;
-@@ -35524,8 +35554,8 @@
-
- case 2208:
-
--/* Line 1455 of yacc.c */
--#line 12952 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12952 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex=Lex;
-@@ -35545,8 +35575,8 @@
-
- case 2209:
-
--/* Line 1455 of yacc.c */
--#line 12971 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12971 "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);
-@@ -35561,8 +35591,8 @@
-
- case 2210:
-
--/* Line 1455 of yacc.c */
--#line 12982 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12982 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- struct sys_var_with_base tmp= (yyvsp[(4) - (6)].variable);
-@@ -35579,8 +35609,8 @@
-
- case 2211:
-
--/* Line 1455 of yacc.c */
--#line 12995 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 12995 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -35598,8 +35628,8 @@
-
- case 2212:
-
--/* Line 1455 of yacc.c */
--#line 13009 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13009 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_pcontext *spc= lex->spcont;
-@@ -35618,8 +35648,8 @@
-
- case 2213:
-
--/* Line 1455 of yacc.c */
--#line 13024 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13024 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- CHARSET_INFO *cs2;
-@@ -35642,8 +35672,8 @@
-
- case 2214:
-
--/* Line 1455 of yacc.c */
--#line 13043 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13043 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -35674,8 +35704,8 @@
-
- case 2215:
-
--/* Line 1455 of yacc.c */
--#line 13070 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13070 "sql/sql_yacc.yy"
- {
- set_var_password *var= new set_var_password((yyvsp[(3) - (5)].lex_user),(yyvsp[(5) - (5)].simple_string));
- if (var == NULL)
-@@ -35689,8 +35719,8 @@
-
- case 2216:
-
--/* Line 1455 of yacc.c */
--#line 13083 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13083 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- sp_pcontext *spc= thd->lex->spcont;
-@@ -35721,8 +35751,8 @@
-
- case 2217:
-
--/* Line 1455 of yacc.c */
--#line 13110 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13110 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (check_reserved_words(&(yyvsp[(1) - (3)].lex_str)))
-@@ -35769,8 +35799,8 @@
-
- case 2218:
-
--/* Line 1455 of yacc.c */
--#line 13153 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13153 "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)
-@@ -35785,43 +35815,43 @@
-
- case 2219:
-
--/* Line 1455 of yacc.c */
--#line 13166 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13166 "sql/sql_yacc.yy"
- { (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
- break;
-
- case 2220:
-
--/* Line 1455 of yacc.c */
--#line 13167 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13167 "sql/sql_yacc.yy"
- { (yyval.tx_isolation)= ISO_READ_COMMITTED; }
- break;
-
- case 2221:
-
--/* Line 1455 of yacc.c */
--#line 13168 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13168 "sql/sql_yacc.yy"
- { (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
- break;
-
- case 2222:
-
--/* Line 1455 of yacc.c */
--#line 13169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13169 "sql/sql_yacc.yy"
- { (yyval.tx_isolation)= ISO_SERIALIZABLE; }
- break;
-
- case 2223:
-
--/* Line 1455 of yacc.c */
--#line 13173 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13173 "sql/sql_yacc.yy"
- { (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;}
- break;
-
- case 2224:
-
--/* Line 1455 of yacc.c */
--#line 13175 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13175 "sql/sql_yacc.yy"
- {
- (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? YYTHD->variables.old_passwords ?
- Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str, (yyvsp[(3) - (4)].lex_str).length) :
-@@ -35834,8 +35864,8 @@
-
- case 2225:
-
--/* Line 1455 of yacc.c */
--#line 13184 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13184 "sql/sql_yacc.yy"
- {
- (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str,
- (yyvsp[(3) - (4)].lex_str).length) :
-@@ -35847,22 +35877,22 @@
-
- case 2226:
-
--/* Line 1455 of yacc.c */
--#line 13195 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13195 "sql/sql_yacc.yy"
- { (yyval.item)=(yyvsp[(1) - (1)].item); }
- break;
-
- case 2227:
-
--/* Line 1455 of yacc.c */
--#line 13196 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13196 "sql/sql_yacc.yy"
- { (yyval.item)=0; }
- break;
-
- case 2228:
-
--/* Line 1455 of yacc.c */
--#line 13198 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13198 "sql/sql_yacc.yy"
- {
- (yyval.item)=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info);
- if ((yyval.item) == NULL)
-@@ -35872,8 +35902,8 @@
-
- case 2229:
-
--/* Line 1455 of yacc.c */
--#line 13204 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13204 "sql/sql_yacc.yy"
- {
- (yyval.item)=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info);
- if ((yyval.item) == NULL)
-@@ -35883,8 +35913,8 @@
-
- case 2230:
-
--/* Line 1455 of yacc.c */
--#line 13210 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13210 "sql/sql_yacc.yy"
- {
- (yyval.item)=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info);
- if ((yyval.item) == NULL)
-@@ -35894,8 +35924,8 @@
-
- case 2231:
-
--/* Line 1455 of yacc.c */
--#line 13221 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13221 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -35910,15 +35940,15 @@
-
- case 2232:
-
--/* Line 1455 of yacc.c */
--#line 13232 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13232 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2237:
-
--/* Line 1455 of yacc.c */
--#line 13247 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13247 "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);
-@@ -35932,36 +35962,36 @@
-
- case 2238:
-
--/* Line 1455 of yacc.c */
--#line 13259 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13259 "sql/sql_yacc.yy"
- { (yyval.num)= TL_READ_NO_INSERT; }
- break;
-
- case 2239:
-
--/* Line 1455 of yacc.c */
--#line 13260 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13260 "sql/sql_yacc.yy"
- { (yyval.num)= TL_WRITE_DEFAULT; }
- break;
-
- case 2240:
-
--/* Line 1455 of yacc.c */
--#line 13261 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13261 "sql/sql_yacc.yy"
- { (yyval.num)= TL_WRITE_LOW_PRIORITY; }
- break;
-
- case 2241:
-
--/* Line 1455 of yacc.c */
--#line 13262 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13262 "sql/sql_yacc.yy"
- { (yyval.num)= TL_READ; }
- break;
-
- case 2242:
-
--/* Line 1455 of yacc.c */
--#line 13267 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13267 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
-
-@@ -35976,15 +36006,15 @@
-
- case 2243:
-
--/* Line 1455 of yacc.c */
--#line 13278 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13278 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2244:
-
--/* Line 1455 of yacc.c */
--#line 13287 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13287 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->sphead)
-@@ -36000,8 +36030,8 @@
-
- case 2245:
-
--/* Line 1455 of yacc.c */
--#line 13299 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13299 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->sphead)
-@@ -36017,8 +36047,8 @@
-
- case 2246:
-
--/* Line 1455 of yacc.c */
--#line 13311 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13311 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->sphead)
-@@ -36041,8 +36071,8 @@
-
- case 2247:
-
--/* Line 1455 of yacc.c */
--#line 13330 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13330 "sql/sql_yacc.yy"
- {
- Lex->expr_allows_subselect= TRUE;
- /* Stored functions are not supported for HANDLER READ. */
-@@ -36057,64 +36087,64 @@
-
- case 2248:
-
--/* Line 1455 of yacc.c */
--#line 13343 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13343 "sql/sql_yacc.yy"
- { Lex->ident= null_lex_str; }
- break;
-
- case 2249:
-
--/* Line 1455 of yacc.c */
--#line 13344 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13344 "sql/sql_yacc.yy"
- { Lex->ident= (yyvsp[(1) - (2)].lex_str); }
- break;
-
- case 2250:
-
--/* Line 1455 of yacc.c */
--#line 13348 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13348 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RFIRST; }
- break;
-
- case 2251:
-
--/* Line 1455 of yacc.c */
--#line 13349 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13349 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RNEXT; }
- break;
-
- case 2252:
-
--/* Line 1455 of yacc.c */
--#line 13353 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13353 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RFIRST; }
- break;
-
- case 2253:
-
--/* Line 1455 of yacc.c */
--#line 13354 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13354 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RNEXT; }
- break;
-
- case 2254:
-
--/* Line 1455 of yacc.c */
--#line 13355 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13355 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RPREV; }
- break;
-
- case 2255:
-
--/* Line 1455 of yacc.c */
--#line 13356 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13356 "sql/sql_yacc.yy"
- { Lex->ha_read_mode = RLAST; }
- break;
-
- case 2256:
-
--/* Line 1455 of yacc.c */
--#line 13358 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13358 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->ha_read_mode = RKEY;
-@@ -36126,57 +36156,57 @@
-
- case 2257:
-
--/* Line 1455 of yacc.c */
--#line 13366 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13366 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2258:
-
--/* Line 1455 of yacc.c */
--#line 13370 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13370 "sql/sql_yacc.yy"
- { (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT; }
- break;
-
- case 2259:
-
--/* Line 1455 of yacc.c */
--#line 13371 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13371 "sql/sql_yacc.yy"
- { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
- break;
-
- case 2260:
-
--/* Line 1455 of yacc.c */
--#line 13372 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13372 "sql/sql_yacc.yy"
- { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
- break;
-
- case 2261:
-
--/* Line 1455 of yacc.c */
--#line 13373 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13373 "sql/sql_yacc.yy"
- { (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY; }
- break;
-
- case 2262:
-
--/* Line 1455 of yacc.c */
--#line 13374 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13374 "sql/sql_yacc.yy"
- { (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY; }
- break;
-
- case 2263:
-
--/* Line 1455 of yacc.c */
--#line 13381 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13381 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2264:
-
--/* Line 1455 of yacc.c */
--#line 13386 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13386 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_REVOKE;
-@@ -36186,8 +36216,8 @@
-
- case 2265:
-
--/* Line 1455 of yacc.c */
--#line 13392 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13392 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->columns.elements)
-@@ -36202,8 +36232,8 @@
-
- case 2266:
-
--/* Line 1455 of yacc.c */
--#line 13403 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13403 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->columns.elements)
-@@ -36218,8 +36248,8 @@
-
- case 2267:
-
--/* Line 1455 of yacc.c */
--#line 13414 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13414 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_REVOKE_ALL;
- }
-@@ -36227,8 +36257,8 @@
-
- case 2268:
-
--/* Line 1455 of yacc.c */
--#line 13418 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13418 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->users_list.push_front ((yyvsp[(3) - (5)].lex_user));
-@@ -36239,15 +36269,15 @@
-
- case 2269:
-
--/* Line 1455 of yacc.c */
--#line 13428 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13428 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2270:
-
--/* Line 1455 of yacc.c */
--#line 13434 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13434 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_GRANT;
-@@ -36257,8 +36287,8 @@
-
- case 2271:
-
--/* Line 1455 of yacc.c */
--#line 13441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13441 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->columns.elements)
-@@ -36273,8 +36303,8 @@
-
- case 2272:
-
--/* Line 1455 of yacc.c */
--#line 13453 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13453 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- if (lex->columns.elements)
-@@ -36289,8 +36319,8 @@
-
- case 2273:
-
--/* Line 1455 of yacc.c */
--#line 13464 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13464 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->users_list.push_front ((yyvsp[(3) - (6)].lex_user));
-@@ -36301,15 +36331,15 @@
-
- case 2276:
-
--/* Line 1455 of yacc.c */
--#line 13478 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13478 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2277:
-
--/* Line 1455 of yacc.c */
--#line 13480 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13480 "sql/sql_yacc.yy"
- {
- Lex->all_privileges= 1;
- Lex->grant= GLOBAL_ACLS;
-@@ -36318,260 +36348,260 @@
-
- case 2282:
-
--/* Line 1455 of yacc.c */
--#line 13498 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13498 "sql/sql_yacc.yy"
- { Lex->which_columns = SELECT_ACL;}
- break;
-
- case 2283:
-
--/* Line 1455 of yacc.c */
--#line 13499 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13499 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2284:
-
--/* Line 1455 of yacc.c */
--#line 13501 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13501 "sql/sql_yacc.yy"
- { Lex->which_columns = INSERT_ACL;}
- break;
-
- case 2285:
-
--/* Line 1455 of yacc.c */
--#line 13502 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13502 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2286:
-
--/* Line 1455 of yacc.c */
--#line 13504 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13504 "sql/sql_yacc.yy"
- { Lex->which_columns = UPDATE_ACL; }
- break;
-
- case 2287:
-
--/* Line 1455 of yacc.c */
--#line 13505 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13505 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2288:
-
--/* Line 1455 of yacc.c */
--#line 13507 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13507 "sql/sql_yacc.yy"
- { Lex->which_columns = REFERENCES_ACL;}
- break;
-
- case 2289:
-
--/* Line 1455 of yacc.c */
--#line 13508 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13508 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2290:
-
--/* Line 1455 of yacc.c */
--#line 13509 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13509 "sql/sql_yacc.yy"
- { Lex->grant |= DELETE_ACL;}
- break;
-
- case 2291:
-
--/* Line 1455 of yacc.c */
--#line 13510 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13510 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2292:
-
--/* Line 1455 of yacc.c */
--#line 13511 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13511 "sql/sql_yacc.yy"
- { Lex->grant |= INDEX_ACL;}
- break;
-
- case 2293:
-
--/* Line 1455 of yacc.c */
--#line 13512 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13512 "sql/sql_yacc.yy"
- { Lex->grant |= ALTER_ACL;}
- break;
-
- case 2294:
-
--/* Line 1455 of yacc.c */
--#line 13513 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13513 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_ACL;}
- break;
-
- case 2295:
-
--/* Line 1455 of yacc.c */
--#line 13514 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13514 "sql/sql_yacc.yy"
- { Lex->grant |= DROP_ACL;}
- break;
-
- case 2296:
-
--/* Line 1455 of yacc.c */
--#line 13515 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13515 "sql/sql_yacc.yy"
- { Lex->grant |= EXECUTE_ACL;}
- break;
-
- case 2297:
-
--/* Line 1455 of yacc.c */
--#line 13516 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13516 "sql/sql_yacc.yy"
- { Lex->grant |= RELOAD_ACL;}
- break;
-
- case 2298:
-
--/* Line 1455 of yacc.c */
--#line 13517 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13517 "sql/sql_yacc.yy"
- { Lex->grant |= SHUTDOWN_ACL;}
- break;
-
- case 2299:
-
--/* Line 1455 of yacc.c */
--#line 13518 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13518 "sql/sql_yacc.yy"
- { Lex->grant |= PROCESS_ACL;}
- break;
-
- case 2300:
-
--/* Line 1455 of yacc.c */
--#line 13519 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13519 "sql/sql_yacc.yy"
- { Lex->grant |= FILE_ACL;}
- break;
-
- case 2301:
-
--/* Line 1455 of yacc.c */
--#line 13520 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13520 "sql/sql_yacc.yy"
- { Lex->grant |= GRANT_ACL;}
- break;
-
- case 2302:
-
--/* Line 1455 of yacc.c */
--#line 13521 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13521 "sql/sql_yacc.yy"
- { Lex->grant |= SHOW_DB_ACL;}
- break;
-
- case 2303:
-
--/* Line 1455 of yacc.c */
--#line 13522 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13522 "sql/sql_yacc.yy"
- { Lex->grant |= SUPER_ACL;}
- break;
-
- case 2304:
-
--/* Line 1455 of yacc.c */
--#line 13523 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13523 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_TMP_ACL;}
- break;
-
- case 2305:
-
--/* Line 1455 of yacc.c */
--#line 13524 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13524 "sql/sql_yacc.yy"
- { Lex->grant |= LOCK_TABLES_ACL; }
- break;
-
- case 2306:
-
--/* Line 1455 of yacc.c */
--#line 13525 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13525 "sql/sql_yacc.yy"
- { Lex->grant |= REPL_SLAVE_ACL; }
- break;
-
- case 2307:
-
--/* Line 1455 of yacc.c */
--#line 13526 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13526 "sql/sql_yacc.yy"
- { Lex->grant |= REPL_CLIENT_ACL; }
- break;
-
- case 2308:
-
--/* Line 1455 of yacc.c */
--#line 13527 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13527 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_VIEW_ACL; }
- break;
-
- case 2309:
-
--/* Line 1455 of yacc.c */
--#line 13528 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13528 "sql/sql_yacc.yy"
- { Lex->grant |= SHOW_VIEW_ACL; }
- break;
-
- case 2310:
-
--/* Line 1455 of yacc.c */
--#line 13529 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13529 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_PROC_ACL; }
- break;
-
- case 2311:
-
--/* Line 1455 of yacc.c */
--#line 13530 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13530 "sql/sql_yacc.yy"
- { Lex->grant |= ALTER_PROC_ACL; }
- break;
-
- case 2312:
-
--/* Line 1455 of yacc.c */
--#line 13531 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13531 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_USER_ACL; }
- break;
-
- case 2313:
-
--/* Line 1455 of yacc.c */
--#line 13532 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13532 "sql/sql_yacc.yy"
- { Lex->grant |= EVENT_ACL;}
- break;
-
- case 2314:
-
--/* Line 1455 of yacc.c */
--#line 13533 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13533 "sql/sql_yacc.yy"
- { Lex->grant |= TRIGGER_ACL; }
- break;
-
- case 2315:
-
--/* Line 1455 of yacc.c */
--#line 13534 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13534 "sql/sql_yacc.yy"
- { Lex->grant |= CREATE_TABLESPACE_ACL; }
- break;
-
- case 2316:
-
--/* Line 1455 of yacc.c */
--#line 13538 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13538 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2317:
-
--/* Line 1455 of yacc.c */
--#line 13539 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13539 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2320:
-
--/* Line 1455 of yacc.c */
--#line 13549 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13549 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->x509_subject)
-@@ -36585,8 +36615,8 @@
-
- case 2321:
-
--/* Line 1455 of yacc.c */
--#line 13559 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13559 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->x509_issuer)
-@@ -36600,8 +36630,8 @@
-
- case 2322:
-
--/* Line 1455 of yacc.c */
--#line 13569 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13569 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (lex->ssl_cipher)
-@@ -36615,8 +36645,8 @@
-
- case 2323:
-
--/* Line 1455 of yacc.c */
--#line 13582 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13582 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- size_t dummy;
-@@ -36635,8 +36665,8 @@
-
- case 2324:
-
--/* Line 1455 of yacc.c */
--#line 13597 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13597 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str;
-@@ -36653,8 +36683,8 @@
-
- case 2325:
-
--/* Line 1455 of yacc.c */
--#line 13610 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13610 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->current_select->db = NULL;
-@@ -36671,8 +36701,8 @@
-
- case 2326:
-
--/* Line 1455 of yacc.c */
--#line 13623 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13623 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL,
-@@ -36685,8 +36715,8 @@
-
- case 2327:
-
--/* Line 1455 of yacc.c */
--#line 13635 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13635 "sql/sql_yacc.yy"
- {
- if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
- MYSQL_YYABORT;
-@@ -36695,8 +36725,8 @@
-
- case 2328:
-
--/* Line 1455 of yacc.c */
--#line 13640 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13640 "sql/sql_yacc.yy"
- {
- if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
- MYSQL_YYABORT;
-@@ -36705,8 +36735,8 @@
-
- case 2329:
-
--/* Line 1455 of yacc.c */
--#line 13648 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13648 "sql/sql_yacc.yy"
- {
- if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
- MYSQL_YYABORT;
-@@ -36715,8 +36745,8 @@
-
- case 2330:
-
--/* Line 1455 of yacc.c */
--#line 13653 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13653 "sql/sql_yacc.yy"
- {
- if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
- MYSQL_YYABORT;
-@@ -36725,8 +36755,8 @@
-
- case 2331:
-
--/* Line 1455 of yacc.c */
--#line 13661 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13661 "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)
-@@ -36759,8 +36789,8 @@
-
- case 2332:
-
--/* Line 1455 of yacc.c */
--#line 13690 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13690 "sql/sql_yacc.yy"
- {
- if (Lex->sql_command == SQLCOM_REVOKE)
- MYSQL_YYABORT;
-@@ -36771,8 +36801,8 @@
-
- case 2333:
-
--/* Line 1455 of yacc.c */
--#line 13697 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13697 "sql/sql_yacc.yy"
- {
- if (Lex->sql_command == SQLCOM_REVOKE)
- MYSQL_YYABORT;
-@@ -36784,8 +36814,8 @@
-
- case 2334:
-
--/* Line 1455 of yacc.c */
--#line 13705 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13705 "sql/sql_yacc.yy"
- {
- if (Lex->sql_command == SQLCOM_REVOKE)
- MYSQL_YYABORT;
-@@ -36797,15 +36827,15 @@
-
- case 2335:
-
--/* Line 1455 of yacc.c */
--#line 13713 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13713 "sql/sql_yacc.yy"
- { (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user); (yyvsp[(1) - (1)].lex_user)->password= null_lex_str; }
- break;
-
- case 2336:
-
--/* Line 1455 of yacc.c */
--#line 13718 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13718 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->grant |= lex->which_columns;
-@@ -36814,8 +36844,8 @@
-
- case 2340:
-
--/* Line 1455 of yacc.c */
--#line 13732 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13732 "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)
-@@ -36844,8 +36874,8 @@
-
- case 2342:
-
--/* Line 1455 of yacc.c */
--#line 13761 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13761 "sql/sql_yacc.yy"
- {
- Lex->ssl_type=SSL_TYPE_SPECIFIED;
- }
-@@ -36853,8 +36883,8 @@
-
- case 2343:
-
--/* Line 1455 of yacc.c */
--#line 13765 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13765 "sql/sql_yacc.yy"
- {
- Lex->ssl_type=SSL_TYPE_ANY;
- }
-@@ -36862,8 +36892,8 @@
-
- case 2344:
-
--/* Line 1455 of yacc.c */
--#line 13769 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13769 "sql/sql_yacc.yy"
- {
- Lex->ssl_type=SSL_TYPE_X509;
- }
-@@ -36871,8 +36901,8 @@
-
- case 2345:
-
--/* Line 1455 of yacc.c */
--#line 13773 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13773 "sql/sql_yacc.yy"
- {
- Lex->ssl_type=SSL_TYPE_NONE;
- }
-@@ -36880,50 +36910,50 @@
-
- case 2346:
-
--/* Line 1455 of yacc.c */
--#line 13779 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13779 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2348:
-
--/* Line 1455 of yacc.c */
--#line 13784 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13784 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2349:
-
--/* Line 1455 of yacc.c */
--#line 13785 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13785 "sql/sql_yacc.yy"
- { Lex->grant |= GRANT_ACL;}
- break;
-
- case 2350:
-
--/* Line 1455 of yacc.c */
--#line 13789 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13789 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2351:
-
--/* Line 1455 of yacc.c */
--#line 13790 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13790 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2352:
-
--/* Line 1455 of yacc.c */
--#line 13794 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13794 "sql/sql_yacc.yy"
- { Lex->grant |= GRANT_ACL;}
- break;
-
- case 2353:
-
--/* Line 1455 of yacc.c */
--#line 13796 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13796 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num);
-@@ -36933,8 +36963,8 @@
-
- case 2354:
-
--/* Line 1455 of yacc.c */
--#line 13802 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13802 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num);
-@@ -36944,8 +36974,8 @@
-
- case 2355:
-
--/* Line 1455 of yacc.c */
--#line 13808 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13808 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num);
-@@ -36955,8 +36985,8 @@
-
- case 2356:
-
--/* Line 1455 of yacc.c */
--#line 13814 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13814 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->mqh.user_conn= (yyvsp[(2) - (2)].ulong_num);
-@@ -36966,8 +36996,8 @@
-
- case 2357:
-
--/* Line 1455 of yacc.c */
--#line 13823 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13823 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command = SQLCOM_BEGIN;
-@@ -36977,85 +37007,85 @@
-
- case 2358:
-
--/* Line 1455 of yacc.c */
--#line 13828 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13828 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2359:
-
--/* Line 1455 of yacc.c */
--#line 13832 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13832 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2360:
-
--/* Line 1455 of yacc.c */
--#line 13833 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13833 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2361:
-
--/* Line 1455 of yacc.c */
--#line 13838 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13838 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
- break;
-
- case 2362:
-
--/* Line 1455 of yacc.c */
--#line 13839 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13839 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_NO; }
- break;
-
- case 2363:
-
--/* Line 1455 of yacc.c */
--#line 13840 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13840 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_YES; }
- break;
-
- case 2364:
-
--/* Line 1455 of yacc.c */
--#line 13845 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13845 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
- break;
-
- case 2365:
-
--/* Line 1455 of yacc.c */
--#line 13846 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13846 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_YES; }
- break;
-
- case 2366:
-
--/* Line 1455 of yacc.c */
--#line 13847 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13847 "sql/sql_yacc.yy"
- { (yyval.m_yes_no_unk)= TVL_NO; }
- break;
-
- case 2367:
-
--/* Line 1455 of yacc.c */
--#line 13851 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13851 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2368:
-
--/* Line 1455 of yacc.c */
--#line 13852 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13852 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2369:
-
--/* Line 1455 of yacc.c */
--#line 13857 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13857 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_COMMIT;
-@@ -37068,8 +37098,8 @@
-
- case 2370:
-
--/* Line 1455 of yacc.c */
--#line 13869 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13869 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_ROLLBACK;
-@@ -37082,8 +37112,8 @@
-
- case 2371:
-
--/* Line 1455 of yacc.c */
--#line 13879 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13879 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
-@@ -37093,8 +37123,8 @@
-
- case 2372:
-
--/* Line 1455 of yacc.c */
--#line 13888 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13888 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_SAVEPOINT;
-@@ -37104,8 +37134,8 @@
-
- case 2373:
-
--/* Line 1455 of yacc.c */
--#line 13897 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13897 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
-@@ -37115,15 +37145,15 @@
-
- case 2374:
-
--/* Line 1455 of yacc.c */
--#line 13910 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13910 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2376:
-
--/* Line 1455 of yacc.c */
--#line 13916 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13916 "sql/sql_yacc.yy"
- {
- if (add_select_to_union_list(Lex, (bool)(yyvsp[(2) - (2)].num), TRUE))
- MYSQL_YYABORT;
-@@ -37132,8 +37162,8 @@
-
- case 2377:
-
--/* Line 1455 of yacc.c */
--#line 13921 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13921 "sql/sql_yacc.yy"
- {
- /*
- Remove from the name resolution context stack the context of the
-@@ -37145,29 +37175,29 @@
-
- case 2378:
-
--/* Line 1455 of yacc.c */
--#line 13931 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13931 "sql/sql_yacc.yy"
- { (yyval.num)= 0; }
- break;
-
- case 2379:
-
--/* Line 1455 of yacc.c */
--#line 13932 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13932 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 2380:
-
--/* Line 1455 of yacc.c */
--#line 13933 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13933 "sql/sql_yacc.yy"
- { (yyval.num)= 1; }
- break;
-
- case 2383:
-
--/* Line 1455 of yacc.c */
--#line 13942 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13942 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37187,8 +37217,8 @@
-
- case 2384:
-
--/* Line 1455 of yacc.c */
--#line 13958 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13958 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- thd->lex->current_select->no_table_names_allowed= 0;
-@@ -37198,29 +37228,29 @@
-
- case 2387:
-
--/* Line 1455 of yacc.c */
--#line 13971 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13971 "sql/sql_yacc.yy"
- { (yyval.num)=1; }
- break;
-
- case 2388:
-
--/* Line 1455 of yacc.c */
--#line 13972 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13972 "sql/sql_yacc.yy"
- { (yyval.num)=1; }
- break;
-
- case 2389:
-
--/* Line 1455 of yacc.c */
--#line 13973 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13973 "sql/sql_yacc.yy"
- { (yyval.num)=0; }
- break;
-
- case 2390:
-
--/* Line 1455 of yacc.c */
--#line 13978 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13978 "sql/sql_yacc.yy"
- {
- (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
- }
-@@ -37228,8 +37258,8 @@
-
- case 2391:
-
--/* Line 1455 of yacc.c */
--#line 13982 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13982 "sql/sql_yacc.yy"
- {
- (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
- }
-@@ -37237,8 +37267,8 @@
-
- case 2393:
-
--/* Line 1455 of yacc.c */
--#line 13991 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13991 "sql/sql_yacc.yy"
- {
- if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
- MYSQL_YYABORT;
-@@ -37247,8 +37277,8 @@
-
- case 2394:
-
--/* Line 1455 of yacc.c */
--#line 13997 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 13997 "sql/sql_yacc.yy"
- {
- Lex->pop_context();
- (yyval.select_lex)= (yyvsp[(1) - (6)].select_lex);
-@@ -37257,8 +37287,8 @@
-
- case 2395:
-
--/* Line 1455 of yacc.c */
--#line 14006 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14006 "sql/sql_yacc.yy"
- {
- (yyval.select_lex)= (yyvsp[(2) - (3)].select_lex);
- }
-@@ -37266,8 +37296,8 @@
-
- case 2396:
-
--/* Line 1455 of yacc.c */
--#line 14012 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14012 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
- if (!lex->expr_allows_subselect ||
-@@ -37290,8 +37320,8 @@
-
- case 2397:
-
--/* Line 1455 of yacc.c */
--#line 14033 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14033 "sql/sql_yacc.yy"
- {
- LEX *lex=Lex;
-
-@@ -37311,15 +37341,15 @@
-
- case 2402:
-
--/* Line 1455 of yacc.c */
--#line 14061 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14061 "sql/sql_yacc.yy"
- { Select->options|= SELECT_STRAIGHT_JOIN; }
- break;
-
- case 2403:
-
--/* Line 1455 of yacc.c */
--#line 14063 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14063 "sql/sql_yacc.yy"
- {
- if (check_simple_select())
- MYSQL_YYABORT;
-@@ -37331,29 +37361,29 @@
-
- case 2404:
-
--/* Line 1455 of yacc.c */
--#line 14070 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14070 "sql/sql_yacc.yy"
- { Select->options|= SELECT_DISTINCT; }
- break;
-
- case 2405:
-
--/* Line 1455 of yacc.c */
--#line 14071 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14071 "sql/sql_yacc.yy"
- { Select->options|= SELECT_SMALL_RESULT; }
- break;
-
- case 2406:
-
--/* Line 1455 of yacc.c */
--#line 14072 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14072 "sql/sql_yacc.yy"
- { Select->options|= SELECT_BIG_RESULT; }
- break;
-
- case 2407:
-
--/* Line 1455 of yacc.c */
--#line 14074 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14074 "sql/sql_yacc.yy"
- {
- if (check_simple_select())
- MYSQL_YYABORT;
-@@ -37363,8 +37393,8 @@
-
- case 2408:
-
--/* Line 1455 of yacc.c */
--#line 14080 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14080 "sql/sql_yacc.yy"
- {
- if (check_simple_select())
- MYSQL_YYABORT;
-@@ -37374,36 +37404,36 @@
-
- case 2409:
-
--/* Line 1455 of yacc.c */
--#line 14085 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14085 "sql/sql_yacc.yy"
- { Select->options|= SELECT_ALL; }
- break;
-
- case 2410:
-
--/* Line 1455 of yacc.c */
--#line 14096 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14096 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2411:
-
--/* Line 1455 of yacc.c */
--#line 14098 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14098 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2412:
-
--/* Line 1455 of yacc.c */
--#line 14100 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14100 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2426:
-
--/* Line 1455 of yacc.c */
--#line 14133 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14133 "sql/sql_yacc.yy"
- {
- /*
- We have to distinguish missing DEFINER-clause from case when
-@@ -37418,8 +37448,8 @@
-
- case 2427:
-
--/* Line 1455 of yacc.c */
--#line 14147 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14147 "sql/sql_yacc.yy"
- {
- YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[(3) - (3)].lex_user));
- }
-@@ -37427,78 +37457,78 @@
-
- case 2428:
-
--/* Line 1455 of yacc.c */
--#line 14160 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14160 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2429:
-
--/* Line 1455 of yacc.c */
--#line 14162 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14162 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2430:
-
--/* Line 1455 of yacc.c */
--#line 14164 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14164 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2431:
-
--/* Line 1455 of yacc.c */
--#line 14169 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14169 "sql/sql_yacc.yy"
- { Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
- break;
-
- case 2432:
-
--/* Line 1455 of yacc.c */
--#line 14174 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14174 "sql/sql_yacc.yy"
- { Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
- break;
-
- case 2433:
-
--/* Line 1455 of yacc.c */
--#line 14176 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14176 "sql/sql_yacc.yy"
- { Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
- break;
-
- case 2434:
-
--/* Line 1455 of yacc.c */
--#line 14178 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14178 "sql/sql_yacc.yy"
- { Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
- break;
-
- case 2435:
-
--/* Line 1455 of yacc.c */
--#line 14183 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14183 "sql/sql_yacc.yy"
- { Lex->create_view_suid= VIEW_SUID_DEFAULT; }
- break;
-
- case 2436:
-
--/* Line 1455 of yacc.c */
--#line 14185 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14185 "sql/sql_yacc.yy"
- { Lex->create_view_suid= VIEW_SUID_DEFINER; }
- break;
-
- case 2437:
-
--/* Line 1455 of yacc.c */
--#line 14187 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14187 "sql/sql_yacc.yy"
- { Lex->create_view_suid= VIEW_SUID_INVOKER; }
- break;
-
- case 2438:
-
--/* Line 1455 of yacc.c */
--#line 14192 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14192 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37515,15 +37545,15 @@
-
- case 2440:
-
--/* Line 1455 of yacc.c */
--#line 14209 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14209 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2442:
-
--/* Line 1455 of yacc.c */
--#line 14215 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14215 "sql/sql_yacc.yy"
- {
- Lex->view_list.push_back((LEX_STRING*)
- sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING)));
-@@ -37532,8 +37562,8 @@
-
- case 2443:
-
--/* Line 1455 of yacc.c */
--#line 14220 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14220 "sql/sql_yacc.yy"
- {
- Lex->view_list.push_back((LEX_STRING*)
- sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING)));
-@@ -37542,8 +37572,8 @@
-
- case 2444:
-
--/* Line 1455 of yacc.c */
--#line 14227 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14227 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->parsing_options.allows_variable= FALSE;
-@@ -37556,8 +37586,8 @@
-
- case 2445:
-
--/* Line 1455 of yacc.c */
--#line 14236 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14236 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= Lex;
-@@ -37575,36 +37605,36 @@
-
- case 2448:
-
--/* Line 1455 of yacc.c */
--#line 14258 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14258 "sql/sql_yacc.yy"
- { Lex->create_view_check= VIEW_CHECK_NONE; }
- break;
-
- case 2449:
-
--/* Line 1455 of yacc.c */
--#line 14260 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14260 "sql/sql_yacc.yy"
- { Lex->create_view_check= VIEW_CHECK_CASCADED; }
- break;
-
- case 2450:
-
--/* Line 1455 of yacc.c */
--#line 14262 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14262 "sql/sql_yacc.yy"
- { Lex->create_view_check= VIEW_CHECK_CASCADED; }
- break;
-
- case 2451:
-
--/* Line 1455 of yacc.c */
--#line 14264 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14264 "sql/sql_yacc.yy"
- { Lex->create_view_check= VIEW_CHECK_LOCAL; }
- break;
-
- case 2452:
-
--/* Line 1455 of yacc.c */
--#line 14281 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14281 "sql/sql_yacc.yy"
- { /* $8 */
- Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start();
- }
-@@ -37612,8 +37642,8 @@
-
- case 2453:
-
--/* Line 1455 of yacc.c */
--#line 14287 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14287 "sql/sql_yacc.yy"
- { /* $12 */
- Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start();
- }
-@@ -37621,8 +37651,8 @@
-
- case 2454:
-
--/* Line 1455 of yacc.c */
--#line 14292 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14292 "sql/sql_yacc.yy"
- { /* $15 */
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37656,8 +37686,8 @@
-
- case 2455:
-
--/* Line 1455 of yacc.c */
--#line 14322 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14322 "sql/sql_yacc.yy"
- { /* $17 */
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -37685,8 +37715,8 @@
-
- case 2456:
-
--/* Line 1455 of yacc.c */
--#line 14356 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14356 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37707,8 +37737,8 @@
-
- case 2457:
-
--/* Line 1455 of yacc.c */
--#line 14374 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14374 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37729,8 +37759,8 @@
-
- case 2458:
-
--/* Line 1455 of yacc.c */
--#line 14397 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14397 "sql/sql_yacc.yy"
- { /* $5 */
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37765,8 +37795,8 @@
-
- case 2459:
-
--/* Line 1455 of yacc.c */
--#line 14429 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14429 "sql/sql_yacc.yy"
- { /* $8 */
- Lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
- }
-@@ -37774,8 +37804,8 @@
-
- case 2460:
-
--/* Line 1455 of yacc.c */
--#line 14433 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14433 "sql/sql_yacc.yy"
- { /* $10 */
- LEX *lex= Lex;
- lex->charset= NULL;
-@@ -37787,8 +37817,8 @@
-
- case 2461:
-
--/* Line 1455 of yacc.c */
--#line 14441 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14441 "sql/sql_yacc.yy"
- { /* $12 */
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -37815,8 +37845,8 @@
-
- case 2462:
-
--/* Line 1455 of yacc.c */
--#line 14464 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14464 "sql/sql_yacc.yy"
- { /* $14 */
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37829,8 +37859,8 @@
-
- case 2463:
-
--/* Line 1455 of yacc.c */
--#line 14473 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14473 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37887,8 +37917,8 @@
-
- case 2464:
-
--/* Line 1455 of yacc.c */
--#line 14529 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14529 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp;
-@@ -37916,8 +37946,8 @@
-
- case 2465:
-
--/* Line 1455 of yacc.c */
--#line 14553 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14553 "sql/sql_yacc.yy"
- {
- const char* tmp_param_begin;
-
-@@ -37929,8 +37959,8 @@
-
- case 2466:
-
--/* Line 1455 of yacc.c */
--#line 14562 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14562 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37942,8 +37972,8 @@
-
- case 2467:
-
--/* Line 1455 of yacc.c */
--#line 14570 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14570 "sql/sql_yacc.yy"
- {
- THD *thd= YYTHD;
- LEX *lex= thd->lex;
-@@ -37955,8 +37985,8 @@
-
- case 2468:
-
--/* Line 1455 of yacc.c */
--#line 14578 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14578 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- sp_head *sp= lex->sphead;
-@@ -37969,8 +37999,8 @@
-
- case 2469:
-
--/* Line 1455 of yacc.c */
--#line 14592 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14592 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_START;
- }
-@@ -37978,8 +38008,8 @@
-
- case 2470:
-
--/* Line 1455 of yacc.c */
--#line 14596 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14596 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_END;
- }
-@@ -37987,8 +38017,8 @@
-
- case 2471:
-
--/* Line 1455 of yacc.c */
--#line 14600 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14600 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_PREPARE;
- }
-@@ -37996,8 +38026,8 @@
-
- case 2472:
-
--/* Line 1455 of yacc.c */
--#line 14604 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14604 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_COMMIT;
- }
-@@ -38005,8 +38035,8 @@
-
- case 2473:
-
--/* Line 1455 of yacc.c */
--#line 14608 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14608 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_ROLLBACK;
- }
-@@ -38014,8 +38044,8 @@
-
- case 2474:
-
--/* Line 1455 of yacc.c */
--#line 14612 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14612 "sql/sql_yacc.yy"
- {
- Lex->sql_command = SQLCOM_XA_RECOVER;
- }
-@@ -38023,8 +38053,8 @@
-
- case 2475:
-
--/* Line 1455 of yacc.c */
--#line 14619 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14619 "sql/sql_yacc.yy"
- {
- MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE);
- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
-@@ -38035,8 +38065,8 @@
-
- case 2476:
-
--/* Line 1455 of yacc.c */
--#line 14626 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14626 "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))))
-@@ -38047,8 +38077,8 @@
-
- case 2477:
-
--/* Line 1455 of yacc.c */
--#line 14633 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14633 "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))))
-@@ -38059,85 +38089,85 @@
-
- case 2478:
-
--/* Line 1455 of yacc.c */
--#line 14642 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14642 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2479:
-
--/* Line 1455 of yacc.c */
--#line 14643 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14643 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2480:
-
--/* Line 1455 of yacc.c */
--#line 14647 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14647 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_NONE; }
- break;
-
- case 2481:
-
--/* Line 1455 of yacc.c */
--#line 14648 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14648 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_JOIN; }
- break;
-
- case 2482:
-
--/* Line 1455 of yacc.c */
--#line 14649 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14649 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_RESUME; }
- break;
-
- case 2483:
-
--/* Line 1455 of yacc.c */
--#line 14653 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14653 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_NONE; }
- break;
-
- case 2484:
-
--/* Line 1455 of yacc.c */
--#line 14654 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14654 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_ONE_PHASE; }
- break;
-
- case 2485:
-
--/* Line 1455 of yacc.c */
--#line 14659 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14659 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_NONE; }
- break;
-
- case 2486:
-
--/* Line 1455 of yacc.c */
--#line 14661 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14661 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_SUSPEND; }
- break;
-
- case 2488:
-
--/* Line 1455 of yacc.c */
--#line 14666 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14666 "sql/sql_yacc.yy"
- {}
- break;
-
- case 2489:
-
--/* Line 1455 of yacc.c */
--#line 14667 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14667 "sql/sql_yacc.yy"
- { Lex->xa_opt=XA_FOR_MIGRATE; }
- break;
-
- case 2490:
-
--/* Line 1455 of yacc.c */
--#line 14672 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14672 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_INSTALL_PLUGIN;
-@@ -38148,8 +38178,8 @@
-
- case 2491:
-
--/* Line 1455 of yacc.c */
--#line 14682 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 1806 of yacc.c */
-+#line 14682 "sql/sql_yacc.yy"
- {
- LEX *lex= Lex;
- lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
-@@ -38159,10 +38189,21 @@
-
-
-
--/* Line 1455 of yacc.c */
--#line 38164 "/export/home/pb2/build/sb_0-8129244-1358321449.66/dist_GPL/sql/sql_yacc.cc"
-+/* Line 1806 of yacc.c */
-+#line 38194 "sql/sql_yacc.cc"
- default: break;
- }
-+ /* User semantic actions sometimes alter yychar, and that requires
-+ that yytoken be updated with the new translation. We take the
-+ approach of translating immediately before every use of yytoken.
-+ One alternative is translating here after every semantic action,
-+ but that translation would be missed if the semantic action invokes
-+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
-+ incorrect destructor might then be invoked immediately. In the
-+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
-+ to an incorrect destructor call or verbose syntax error message
-+ before the lookahead is translated. */
- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
- YYPOPSTACK (yylen);
-@@ -38190,6 +38231,10 @@
- | yyerrlab -- here on detecting error |
- `------------------------------------*/
- yyerrlab:
-+ /* Make sure we have latest lookahead translation. See comments at
-+ user semantic actions for why this is necessary. */
-+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-+
- /* If not already recovering from an error, report this error. */
- if (!yyerrstatus)
- {
-@@ -38197,37 +38242,36 @@
- #if ! YYERROR_VERBOSE
- yyerror (YY_("syntax error"));
- #else
-+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-+ yyssp, yytoken)
- {
-- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-- {
-- YYSIZE_T yyalloc = 2 * yysize;
-- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-- yyalloc = YYSTACK_ALLOC_MAXIMUM;
-- if (yymsg != yymsgbuf)
-- YYSTACK_FREE (yymsg);
-- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-- if (yymsg)
-- yymsg_alloc = yyalloc;
-- else
-- {
-- yymsg = yymsgbuf;
-- yymsg_alloc = sizeof yymsgbuf;
-- }
-- }
--
-- if (0 < yysize && yysize <= yymsg_alloc)
-- {
-- (void) yysyntax_error (yymsg, yystate, yychar);
-- yyerror (yymsg);
-- }
-- else
-- {
-- yyerror (YY_("syntax error"));
-- if (yysize != 0)
-- goto yyexhaustedlab;
-- }
-+ char const *yymsgp = YY_("syntax error");
-+ int yysyntax_error_status;
-+ yysyntax_error_status = YYSYNTAX_ERROR;
-+ if (yysyntax_error_status == 0)
-+ yymsgp = yymsg;
-+ else if (yysyntax_error_status == 1)
-+ {
-+ if (yymsg != yymsgbuf)
-+ YYSTACK_FREE (yymsg);
-+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-+ if (!yymsg)
-+ {
-+ yymsg = yymsgbuf;
-+ yymsg_alloc = sizeof yymsgbuf;
-+ yysyntax_error_status = 2;
-+ }
-+ else
-+ {
-+ yysyntax_error_status = YYSYNTAX_ERROR;
-+ yymsgp = yymsg;
-+ }
-+ }
-+ yyerror (yymsgp);
-+ if (yysyntax_error_status == 2)
-+ goto yyexhaustedlab;
- }
-+# undef YYSYNTAX_ERROR
- #endif
- }
-
-@@ -38286,7 +38330,7 @@
- for (;;)
- {
- yyn = yypact[yystate];
-- if (yyn != YYPACT_NINF)
-+ if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-@@ -38345,8 +38389,13 @@
-
- yyreturn:
- if (yychar != YYEMPTY)
-- yydestruct ("Cleanup: discarding lookahead",
-- yytoken, &yylval);
-+ {
-+ /* Make sure we have latest lookahead translation. See comments at
-+ user semantic actions for why this is necessary. */
-+ yytoken = YYTRANSLATE (yychar);
-+ yydestruct ("Cleanup: discarding lookahead",
-+ yytoken, &yylval);
-+ }
- /* Do not reclaim the symbols of the rule which action triggered
- this YYABORT or YYACCEPT. */
- YYPOPSTACK (yylen);
-Index: mysql-5.5-5.5.30+dfsg/sql/sql_yacc.h
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/sql/sql_yacc.h 2013-01-15 23:35:32.000000000 -0800
-+++ mysql-5.5-5.5.30+dfsg/sql/sql_yacc.h 2013-03-12 12:06:41.000000000 -0700
-@@ -1,10 +1,8 @@
-+/* A Bison parser, made by GNU Bison 2.5. */
-
--/* A Bison parser, made by GNU Bison 2.4.1. */
--
--/* Skeleton interface for Bison's Yacc-like parsers in C
-+/* Bison interface for Yacc-like parsers in C
-
-- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-- Free Software Foundation, Inc.
-+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-
- 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
-@@ -1230,8 +1228,8 @@
- typedef union YYSTYPE
- {
-
--/* Line 1676 of yacc.c */
--#line 730 "/export/home/pb2/build/sb_0-8129244-1358321449.66/mysql-5.5.30-release-export-4665465_gpl/sql/sql_yacc.yy"
-+/* Line 2068 of yacc.c */
-+#line 730 "sql/sql_yacc.yy"
-
- int num;
- ulong ulong_num;
-@@ -1281,8 +1279,8 @@
-
-
-
--/* Line 1676 of yacc.c */
--#line 1286 "/export/home/pb2/build/sb_0-8129244-1358321449.66/dist_GPL/sql/sql_yacc.h"
-+/* Line 2068 of yacc.c */
-+#line 1284 "sql/sql_yacc.h"
- } YYSTYPE;
- # define YYSTYPE_IS_TRIVIAL 1
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
Modified: mysql-5.5/branches/unstable/debian/patches/regex_plus.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/regex_plus.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/regex_plus.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/674210
Bug: http://bugs.mysql.com/bug.php?id=65408
Last-Update: 2012-05-24
-Index: mysql-5.5.29/mysql-test/include/mysqld--help.inc
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/include/mysqld--help.inc
===================================================================
---- mysql-5.5.29.orig/mysql-test/include/mysqld--help.inc 2013-01-02 15:36:15.078372518 -0800
-+++ mysql-5.5.29/mysql-test/include/mysqld--help.inc 2013-01-02 15:38:16.403258546 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/include/mysqld--help.inc 2013-05-05 09:47:48.259181047 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/include/mysqld--help.inc 2013-05-05 09:47:48.255181280 -0700
@@ -47,7 +47,11 @@
s/\b4294967295\b/18446744073709551615/;
s/\b2146435072\b/9223372036853727232/;
@@ -20,10 +20,10 @@
next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again
next if $skip;
print;
-Index: mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
+Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:36:15.078372518 -0800
-+++ mysql-5.5.29/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-01-02 15:38:16.403258546 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-05-05 09:47:48.259181047 -0700
++++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/sys_vars/t/character_sets_dir_basic.test 2013-05-05 09:47:48.255181280 -0700
@@ -7,6 +7,7 @@
# TODO: fix with a proper comparison in mysqltest
let $rcd= `SELECT REPLACE('$MYSQL_CHARSETSDIR', '\\\\\', '.')`;
Modified: mysql-5.5/branches/unstable/debian/patches/series
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/series 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/series 2013-05-06 06:20:44 UTC (rev 2223)
@@ -9,4 +9,3 @@
regex_plus.patch
versioned_symbols.patch
debian-mdev382-fixup.patch
-yassl.patch
Modified: mysql-5.5/branches/unstable/debian/patches/versioned_symbols.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/versioned_symbols.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/versioned_symbols.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -3,10 +3,10 @@
Debian-Bug: http://bugs.debian.org/660686
Subject: versioned symbols got dropped from the build
Last-Update: 2012-06-01
-Index: mysql-5.5.29/libmysql/CMakeLists.txt
+Index: mysql-5.5-5.5.31+dfsg/libmysql/CMakeLists.txt
===================================================================
---- mysql-5.5.29.orig/libmysql/CMakeLists.txt 2013-01-02 15:36:15.014376269 -0800
-+++ mysql-5.5.29/libmysql/CMakeLists.txt 2013-01-02 15:38:17.931168951 -0800
+--- mysql-5.5-5.5.31+dfsg.orig/libmysql/CMakeLists.txt 2013-05-05 09:47:48.275180114 -0700
++++ mysql-5.5-5.5.31+dfsg/libmysql/CMakeLists.txt 2013-05-05 09:47:48.275180114 -0700
@@ -136,6 +136,8 @@
)
Deleted: mysql-5.5/branches/unstable/debian/patches/yassl.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/yassl.patch 2013-05-05 16:41:44 UTC (rev 2222)
+++ mysql-5.5/branches/unstable/debian/patches/yassl.patch 2013-05-06 06:20:44 UTC (rev 2223)
@@ -1,468 +0,0 @@
-Author: Michael Stapelberg <stapelberg at debian.org>
-Origin: http://www.yassl.com/
-Forwarded: no
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699886
-Description: Fixes CVE-2013-0169
- MySQL uses yaSSL 2.2.2. yaSSL has released version 2.2.2d which addresses this
- problem. I applied the patch to MySQL, see bug 699886 for details.
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/openssl/ssl.h
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/openssl/ssl.h 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/include/openssl/ssl.h 2013-04-14 13:15:17.402046571 +0200
-@@ -35,7 +35,7 @@
- #include "rsa.h"
-
-
--#define YASSL_VERSION "2.2.2"
-+#define YASSL_VERSION "2.2.2d"
-
-
- #if defined(__cplusplus)
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_error.hpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/yassl_error.hpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_error.hpp 2013-04-14 13:15:17.402046571 +0200
-@@ -53,7 +53,8 @@
- badVersion_error = 117,
- compress_error = 118,
- decompress_error = 119,
-- pms_version_error = 120
-+ pms_version_error = 120,
-+ sanityCipher_error = 121
-
- // !!!! add error message to .cpp !!!!
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_types.hpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/include/yassl_types.hpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/include/yassl_types.hpp 2013-04-14 13:15:17.403046590 +0200
-@@ -220,7 +220,11 @@
- const int MAX_RECORD_SIZE = 16384; // 2^14, max size by standard
- const int COMPRESS_EXTRA = 1024; // extra compression possible addition
- const int SESSION_FLUSH_COUNT = 256; // when to flush session cache
--
-+const int MAX_PAD_SIZE = 256; // max TLS padding size
-+const int COMPRESS_CONSTANT = 13; // compression calculation constant
-+const int COMPRESS_UPPER = 55; // compression calculation numerator
-+const int COMPRESS_LOWER = 64; // compression calculation denominator
-+const int COMPRESS_DUMMY_SIZE = 64; // compression dummy round size
-
- typedef uint8 Cipher; // first byte is always 0x00 for SSLv3 & TLS
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/src/handshake.cpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/src/handshake.cpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/src/handshake.cpp 2013-04-14 13:15:17.405046628 +0200
-@@ -221,12 +221,45 @@
- }
-
-
-+// sanity checks on encrypted message size
-+static int sanity_check_message(SSL& ssl, uint msgSz)
-+{
-+ uint minSz = 0;
-+
-+ if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-+ uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
-+ if (msgSz % blockSz)
-+ return -1;
-+
-+ minSz = ssl.getSecurity().get_parms().hash_size_ + 1; // pad byte too
-+ if (blockSz > minSz)
-+ minSz = blockSz;
-+
-+ if (ssl.isTLSv1_1())
-+ minSz += blockSz; // explicit IV
-+ }
-+ else { // stream
-+ minSz = ssl.getSecurity().get_parms().hash_size_;
-+ }
-+
-+ if (msgSz < minSz)
-+ return -1;
-+
-+ return 0;
-+}
-+
-+
- // decrypt input message in place, store size in case needed later
- void decrypt_message(SSL& ssl, input_buffer& input, uint sz)
- {
- input_buffer plain(sz);
- opaque* cipher = input.get_buffer() + input.get_current();
-
-+ if (sanity_check_message(ssl, sz) != 0) {
-+ ssl.SetError(sanityCipher_error);
-+ return;
-+ }
-+
- ssl.useCrypto().use_cipher().decrypt(plain.get_buffer(), cipher, sz);
- memcpy(cipher, plain.get_buffer(), sz);
- ssl.useSecurity().use_parms().encrypt_size_ = sz;
-@@ -774,6 +807,8 @@
- return 0;
- }
- decrypt_message(ssl, buffer, hdr.length_);
-+ if (ssl.GetError())
-+ return 0;
- }
-
- mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_));
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/src/yassl_error.cpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/src/yassl_error.cpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/src/yassl_error.cpp 2013-04-14 13:15:17.405046628 +0200
-@@ -144,6 +144,10 @@
- strncpy(buffer, "bad PreMasterSecret version error", max);
- break;
-
-+ case sanityCipher_error :
-+ strncpy(buffer, "sanity check on cipher text size error", max);
-+ break;
-+
- // openssl errors
- case SSL_ERROR_WANT_READ :
- strncpy(buffer, "the read operation would block", max);
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/src/yassl_imp.cpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/src/yassl_imp.cpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/src/yassl_imp.cpp 2013-04-14 13:16:02.777908499 +0200
-@@ -972,29 +972,193 @@
- }
-
-
-+// check all bytes for equality
-+static int constant_compare(const byte* a, const byte* b, int len)
-+{
-+ int good = 0;
-+ int bad = 0;
-+
-+ for (int i = 0; i < len; i++) {
-+ if (a[i] == b[i])
-+ good++;
-+ else
-+ bad++;
-+ }
-+
-+ if (good == len)
-+ return 0;
-+ else
-+ return 0 - bad; // failure
-+}
-+
-+
-+// check bytes for pad value
-+static int pad_check(const byte* input, byte pad, int len)
-+{
-+ int good = 0;
-+ int bad = 0;
-+
-+ for (int i = 0; i < len; i++) {
-+ if (input[i] == pad)
-+ good++;
-+ else
-+ bad++;
-+ }
-+
-+ if (good == len)
-+ return 0;
-+ else
-+ return 0 - bad; // failure
-+}
-+
-+
-+// get number of compression rounds
-+static inline int get_rounds(int pLen, int padLen, int t)
-+{
-+ int roundL1 = 1; // round ups
-+ int roundL2 = 1;
-+
-+ int L1 = COMPRESS_CONSTANT + pLen - t;
-+ int L2 = COMPRESS_CONSTANT + pLen - padLen - 1 - t;
-+
-+ L1 -= COMPRESS_UPPER;
-+ L2 -= COMPRESS_UPPER;
-+
-+ if ( (L1 % COMPRESS_LOWER) == 0)
-+ roundL1 = 0;
-+ if ( (L2 % COMPRESS_LOWER) == 0)
-+ roundL2 = 0;
-+
-+ L1 /= COMPRESS_LOWER;
-+ L2 /= COMPRESS_LOWER;
-+
-+ L1 += roundL1;
-+ L2 += roundL2;
-+
-+ return L1 - L2;
-+}
-+
-+
-+// do compression rounds on dummy data
-+static inline void compress_rounds(SSL& ssl, int rounds, const byte* dummy)
-+{
-+ if (rounds) {
-+ Digest* digest = NULL;
-+
-+ MACAlgorithm ma = ssl.getSecurity().get_parms().mac_algorithm_;
-+ if (ma == sha)
-+ digest = NEW_YS SHA;
-+ else if (ma == md5)
-+ digest = NEW_YS MD5;
-+ else if (ma == rmd)
-+ digest = NEW_YS RMD;
-+ else
-+ return;
-+
-+ for (int i = 0; i < rounds; i++)
-+ digest->update(dummy, COMPRESS_LOWER);
-+
-+ ysDelete(digest);
-+ }
-+}
-+
-+
-+// timing resistant pad verification
-+static int timing_verify(SSL& ssl, const byte* input, int padLen, int t,
-+ int pLen)
-+{
-+ byte verify[SHA_LEN];
-+ byte dummy[MAX_PAD_SIZE];
-+
-+ memset(dummy, 1, sizeof(dummy));
-+
-+ if ( (t + padLen + 1) > pLen) {
-+ pad_check(dummy, (byte)padLen, MAX_PAD_SIZE);
-+ if (ssl.isTLS())
-+ TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
-+ else
-+ hmac(ssl, verify, input, pLen - t, application_data, 1);
-+ constant_compare(verify, input + pLen - t, t);
-+
-+ return -1;
-+ }
-+
-+ if (pad_check(input + pLen - (padLen + 1), (byte)padLen, padLen + 1) != 0) {
-+ pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
-+ if (ssl.isTLS())
-+ TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
-+ else
-+ hmac(ssl, verify, input, pLen - t, application_data, 1);
-+ constant_compare(verify, input + pLen - t, t);
-+
-+ return -1;
-+ }
-+
-+ pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
-+ if (ssl.isTLS())
-+ TLS_hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data,1);
-+ else
-+ hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data, 1);
-+
-+ compress_rounds(ssl, get_rounds(pLen, padLen, t), dummy);
-+
-+ if (constant_compare(verify, input + (pLen - padLen - 1 - t), t) != 0)
-+ return -1;
-+
-+ return 0;
-+}
-+
-+
- // Process handler for Data
- void Data::Process(input_buffer& input, SSL& ssl)
- {
- int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
- int pad = 0, padSz = 0;
- int ivExtra = 0;
-+ int digestSz = ssl.getCrypto().get_digest().get_digestSize();
-+ const byte* rawData = input.get_buffer() + input.get_current();
-+ opaque verify[SHA_LEN];
-
- if (ssl.getSecurity().get_parms().cipher_type_ == block) {
- if (ssl.isTLSv1_1()) // IV
- ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
- pad = *(input.get_buffer() + input.get_current() + msgSz -ivExtra - 1);
- padSz = 1;
-+
-+ if (ssl.isTLS()) {
-+ if (timing_verify(ssl, rawData, pad,digestSz, msgSz-ivExtra) != 0) {
-+ ssl.SetError(verify_error);
-+ return;
-+ }
-+ }
-+ else { // SSLv3, some don't do this padding right
-+ int sz3 = msgSz - digestSz - pad - 1;
-+ hmac(ssl, verify, rawData, sz3, application_data, true);
-+ if (constant_compare(verify, rawData + sz3, digestSz) != 0) {
-+ ssl.SetError(verify_error);
-+ return;
-+ }
-+ }
- }
-- int digestSz = ssl.getCrypto().get_digest().get_digestSize();
-+ else { // stream
-+ int streamSz = msgSz - digestSz;
-+ if (ssl.isTLS())
-+ TLS_hmac(ssl, verify, rawData, streamSz, application_data, true);
-+ else
-+ hmac(ssl, verify, rawData, streamSz, application_data, true);
-+ if (constant_compare(verify, rawData + streamSz, digestSz) != 0) {
-+ ssl.SetError(verify_error);
-+ return;
-+ }
-+ }
-+
- int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
-- opaque verify[SHA_LEN];
-
- if (dataSz < 0) {
- ssl.SetError(bad_input);
- return;
- }
-
-- const byte* rawData = input.get_buffer() + input.get_current();
-
- // read data
- if (dataSz) { // could be compressed
-@@ -1013,27 +1177,10 @@
- input.read(data->get_buffer(), dataSz);
- data->add_size(dataSz);
- }
--
-- if (ssl.isTLS())
-- TLS_hmac(ssl, verify, rawData, dataSz, application_data, true);
-- else
-- hmac(ssl, verify, rawData, dataSz, application_data, true);
- }
-
-- // read mac and skip fill
-- opaque mac[SHA_LEN];
-- input.read(mac, digestSz);
-- input.set_current(input.get_current() + pad + padSz);
--
-- // verify
-- if (dataSz) {
-- if (memcmp(mac, verify, digestSz)) {
-- ssl.SetError(verify_error);
-- return;
-- }
-- }
-- else
-- ssl.get_SEQIncrement(true); // even though no data, increment verify
-+ // advance past mac and fill
-+ input.set_current(input.get_current() + digestSz + pad + padSz);
- }
-
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/include/asn.hpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/taocrypt/include/asn.hpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/include/asn.hpp 2013-04-14 13:15:17.409046704 +0200
-@@ -112,7 +112,7 @@
- MAX_LENGTH_SZ = 5,
- MAX_SEQ_SZ = 5, // enum(seq|con) + length(4)
- MAX_ALGO_SIZE = 9,
-- MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4)
-+ MAX_DIGEST_SZ = 69, // SHA512 + enum(Bit or Octet) + length(4)
- DSA_SIG_SZ = 40,
- ASN_NAME_MAX = 512 // max total of all included names
- };
-@@ -258,8 +258,11 @@
-
-
- enum ContentType { HUH = 651 };
--enum SigType { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA =649};
--enum HashType { MD2h = 646, MD5h = 649, SHAh = 88 };
-+enum SigType { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
-+ SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
-+ SHA256wDSA = 416 };
-+enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414, SHA384h = 415,
-+ SHA512h = 416 };
- enum KeyType { DSAk = 515, RSAk = 645 }; // sums of algo OID
-
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/include/sha.hpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/taocrypt/include/sha.hpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/include/sha.hpp 2013-04-14 13:15:17.409046704 +0200
-@@ -158,6 +158,12 @@
- void Transform();
- };
-
-+enum { MAX_SHA2_DIGEST_SIZE = 64 }; // SHA512
-+
-+#else
-+
-+enum { MAX_SHA2_DIGEST_SIZE = 32 }; // SHA256
-+
- #endif // WORD64_AVAILABLE
-
-
-Index: mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/src/asn.cpp
-===================================================================
---- mysql-5.5-5.5.30+dfsg.orig/extra/yassl/taocrypt/src/asn.cpp 2013-01-16 08:35:17.000000000 +0100
-+++ mysql-5.5-5.5.30+dfsg/extra/yassl/taocrypt/src/asn.cpp 2013-04-14 13:15:17.411046742 +0200
-@@ -972,12 +972,26 @@
- hasher.reset(NEW_TC SHA);
- ht = SHAh;
- }
-+ else if (signatureOID_ == SHA256wRSA || signatureOID_ == SHA256wDSA) {
-+ hasher.reset(NEW_TC SHA256);
-+ ht = SHA256h;
-+ }
-+#ifdef WORD64_AVAILABLE
-+ else if (signatureOID_ == SHA384wRSA) {
-+ hasher.reset(NEW_TC SHA384);
-+ ht = SHA384h;
-+ }
-+ else if (signatureOID_ == SHA512wRSA) {
-+ hasher.reset(NEW_TC SHA512);
-+ ht = SHA512h;
-+ }
-+#endif
- else {
- source_.SetError(UNKOWN_SIG_E);
- return false;
- }
-
-- byte digest[SHA::DIGEST_SIZE]; // largest size
-+ byte digest[MAX_SHA2_DIGEST_SIZE]; // largest size
-
- hasher->Update(source_.get_buffer() + certBegin_, sigIndex_ - certBegin_);
- hasher->Final(digest);
-@@ -1050,6 +1064,12 @@
- 0x02, 0x05, 0x05, 0x00 };
- static const byte md2AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
- 0x02, 0x02, 0x05, 0x00};
-+ static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-+ 0x04, 0x02, 0x01, 0x05, 0x00 };
-+ static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-+ 0x04, 0x02, 0x02, 0x05, 0x00 };
-+ static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-+ 0x04, 0x02, 0x03, 0x05, 0x00 };
-
- int algoSz = 0;
- const byte* algoName = 0;
-@@ -1060,6 +1080,21 @@
- algoName = shaAlgoID;
- break;
-
-+ case SHA256h:
-+ algoSz = sizeof(sha256AlgoID);
-+ algoName = sha256AlgoID;
-+ break;
-+
-+ case SHA384h:
-+ algoSz = sizeof(sha384AlgoID);
-+ algoName = sha384AlgoID;
-+ break;
-+
-+ case SHA512h:
-+ algoSz = sizeof(sha512AlgoID);
-+ algoName = sha512AlgoID;
-+ break;
-+
- case MD2h:
- algoSz = sizeof(md2AlgoID);
- algoName = md2AlgoID;
More information about the Pkg-mysql-commits
mailing list