[Pkg-mysql-commits] [mariadb-5.5] 01/03: New upstream version 5.5.58
Otto Kekäläinen
otto at moszumanska.debian.org
Sun Dec 31 10:15:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
otto pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.
commit fa5f29ea244cc236713b5f55b26fdabf109a19ec
Author: Otto Kekäläinen <otto at debian.org>
Date: Sat Dec 30 17:55:00 2017 +0200
New upstream version 5.5.58
---
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysql.cc | 5 +-
client/mysqldump.c | 1 +
extra/my_print_defaults.c | 21 +-
extra/replace.c | 1 +
extra/yassl/README | 8 +
extra/yassl/include/openssl/ssl.h | 4 +-
extra/yassl/src/yassl_imp.cpp | 6 +-
extra/yassl/src/yassl_int.cpp | 14 +-
.../include/wait_for_slave_sql_error_and_skip.inc | 7 +
mysql-test/mysql-test-run.pl | 3 +-
mysql-test/r/alter_table.result | 52 +
mysql-test/r/case.result | 16 +
mysql-test/r/count_distinct.result | 25 +
mysql-test/r/ctype_ucs.result | 30 +
mysql-test/r/ctype_utf32.result | 15 +
mysql-test/r/ctype_utf8.result | 22 +
mysql-test/r/errors.result | 2 +-
mysql-test/r/func_in.result | 6 +
mysql-test/r/func_time.result | 34 +
mysql-test/r/log_tables-big.result | 9 +-
mysql-test/r/myisam.result | 9 +-
mysql-test/r/partition_datatype.result | 8 +-
mysql-test/r/ps.result | 143 +
mysql-test/r/read_only.result | 3 +
mysql-test/r/show_check.result | 4 +-
...ow_function_with_pad_char_to_full_length.result | 24 +
mysql-test/r/strict.result | 4 +-
mysql-test/r/subselect_mat_cost_bugs.result | 17 +
mysql-test/r/type_blob.result | 2 +-
mysql-test/r/type_varchar.result | 69 +
mysql-test/r/view.result | 3 -
mysql-test/suite/maria/maria.result | 9 +-
mysql-test/suite/maria/maria.test | 3 +-
.../suite/parts/r/partition_alter_maria.result | 18 +
.../suite/parts/t/partition_alter_maria.test | 18 +
mysql-test/suite/vcol/r/vcol_misc.result | 19 +
mysql-test/suite/vcol/t/vcol_misc.test | 20 +
mysql-test/t/alter_table.test | 41 +
mysql-test/t/case.test | 12 +
mysql-test/t/count_distinct.test | 29 +
mysql-test/t/ctype_ucs.test | 23 +
mysql-test/t/ctype_utf32.test | 13 +
mysql-test/t/ctype_utf8.test | 16 +
mysql-test/t/func_in.test | 8 +
mysql-test/t/func_time.test | 31 +
mysql-test/t/log_tables-big.test | 9 +-
mysql-test/t/myisam.test | 3 +-
mysql-test/t/partition_datatype.test | 8 +-
mysql-test/t/ps.test | 129 +
mysql-test/t/read_only.test | 5 +
...show_function_with_pad_char_to_full_length.test | 23 +
mysql-test/t/subselect_mat_cost_bugs.test | 19 +
mysql-test/t/type_varchar.test | 44 +
mysql-test/t/view.test | 5 +-
mysys/my_new.cc | 10 +
plugin/handler_socket/CMakeLists.txt | 6 +
plugin/server_audit/server_audit.c | 10 +-
scripts/CMakeLists.txt | 5 +
scripts/mysql_install_db.sh | 48 +-
sql-common/client.c | 1 +
sql/events.cc | 8 +-
sql/field.cc | 16 +-
sql/ha_partition.cc | 6 +-
sql/item.cc | 12 +-
sql/item.h | 4 +-
sql/item_func.cc | 2 +
sql/item_row.cc | 30 +-
sql/item_row.h | 1 +
sql/item_strfunc.cc | 4 +-
sql/item_subselect.cc | 6 +
sql/item_timefunc.cc | 15 +-
sql/item_timefunc.h | 10 +-
sql/log.cc | 5 +
sql/log_event.cc | 15 -
sql/opt_subselect.cc | 55 +-
sql/opt_sum.cc | 1 +
sql/partition_info.cc | 2 -
sql/slave.cc | 1 -
sql/sp_head.cc | 2 +-
sql/sql_admin.cc | 1 -
sql/sql_base.cc | 7 +-
sql/sql_base.h | 5 +-
sql/sql_class.h | 2 +-
sql/sql_const.h | 13 +-
sql/sql_derived.cc | 4 +-
sql/sql_do.cc | 2 +-
sql/sql_insert.cc | 14 +-
sql/sql_lex.cc | 4 +-
sql/sql_lex.h | 1 +
sql/sql_load.cc | 10 +-
sql/sql_parse.cc | 47 +-
sql/sql_partition.cc | 43 +-
sql/sql_partition.h | 3 +-
sql/sql_plugin.cc | 131 +-
sql/sql_prepare.cc | 10 +-
sql/sql_repl.cc | 1 +
sql/sql_select.cc | 23 +-
sql/sql_show.cc | 11 +-
sql/sql_table.cc | 47 +-
sql/sql_update.cc | 4 +-
sql/sql_yacc.cc | 8292 ++++++++++----------
sql/sql_yacc.yy | 10 +-
sql/table.h | 3 +-
sql/uniques.cc | 12 +-
storage/federated/ha_federated.cc | 3 +
storage/federatedx/federatedx_io_mysql.cc | 9 +-
storage/federatedx/ha_federatedx.cc | 2 +
storage/heap/hp_create.c | 2 +-
storage/heap/hp_extra.c | 1 +
storage/innobase/btr/btr0cur.c | 10 +-
storage/innobase/handler/ha_innodb.cc | 5 +-
storage/innobase/include/data0type.ic | 2 +-
storage/innobase/include/page0zip.ic | 2 +-
storage/innobase/row/row0mysql.c | 5 +-
storage/innobase/row/row0purge.c | 4 +-
storage/innobase/row/row0sel.c | 1 +
storage/maria/ma_extra.c | 3 +-
storage/maria/ma_key_recover.c | 1 +
storage/maria/ma_loghandler.c | 2 +-
storage/maria/ma_recovery.c | 2 +-
storage/myisam/mi_extra.c | 3 +-
storage/sphinx/ha_sphinx.cc | 12 +-
storage/tokudb/CMakeLists.txt | 1 +
.../tokudb/mysql-test/tokudb/r/type_blob.result | 2 +-
storage/xtradb/btr/btr0cur.c | 10 +-
storage/xtradb/handler/ha_innodb.cc | 5 +-
storage/xtradb/include/data0type.ic | 2 +-
storage/xtradb/include/page0zip.ic | 2 +-
storage/xtradb/include/univ.i | 2 +-
storage/xtradb/row/row0mysql.c | 4 +-
storage/xtradb/row/row0purge.c | 4 +-
storage/xtradb/row/row0sel.c | 1 +
storage/xtradb/trx/trx0sys.c | 2 +-
strings/ctype-utf8.c | 17 +-
strings/dtoa.c | 13 +-
137 files changed, 5682 insertions(+), 4511 deletions(-)
diff --git a/Docs/INFO_SRC b/Docs/INFO_SRC
index 7887ce5..179b76b 100644
--- a/Docs/INFO_SRC
+++ b/Docs/INFO_SRC
@@ -1,8 +1,8 @@
-commit: 59fca5806af65c8379a993f9e604cb0b20a76e2b
-date: 2017-07-18 19:50:11 +0200
-build-date: 2017-07-18 20:33:21 +0000
-short: 59fca58
+commit: b000e169562697aa072600695d4f0c0412f94f4f
+date: 2017-10-17 11:04:09 +0200
+build-date: 2017-10-17 11:48:04 +0000
+short: b000e16
branch: HEAD
-MySQL source 5.5.57
+MySQL source 5.5.58
diff --git a/VERSION b/VERSION
index 68358ac..2905c37 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=57
+MYSQL_VERSION_PATCH=58
MYSQL_VERSION_EXTRA=
diff --git a/client/mysql.cc b/client/mysql.cc
index 9c76e30..3521896 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1067,8 +1067,7 @@ static void fix_history(String *final_command);
static COMMANDS *find_command(char *name);
static COMMANDS *find_command(char cmd_name);
-static bool add_line(String &buffer, char *line, ulong line_length,
- char *in_string, bool *ml_comment, bool truncated);
+static bool add_line(String &, char *, ulong, char *, bool *, bool);
static void remove_cntrl(String &buffer);
static void print_table_data(MYSQL_RES *result);
static void print_table_data_html(MYSQL_RES *result);
@@ -1080,7 +1079,7 @@ static ulong start_timer(void);
static void end_timer(ulong start_time,char *buff);
static void mysql_end_timer(ulong start_time,char *buff);
static void nice_time(double sec,char *buff,bool part_second);
-extern "C" sig_handler mysql_end(int sig);
+extern "C" sig_handler mysql_end(int sig) __attribute__ ((noreturn));
extern "C" sig_handler handle_sigint(int sig);
#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
static sig_handler window_resize(int sig);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 2e3270a..4e611ed 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2012,6 +2012,7 @@ static void print_xml_comment(FILE *xml_file, size_t len,
case '-':
if (*(comment_string + 1) == '-') /* Only one hyphen allowed. */
break;
+ /* fall through */
default:
fputc(*comment_string, xml_file);
break;
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index 7558d6d..4690b29 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -97,12 +97,16 @@ static struct my_option my_long_options[] =
};
-static void usage(my_bool version)
+static void version()
{
- printf("%s Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE,
- MACHINE_TYPE);
- if (version)
- return;
+ printf("%s Ver 1.6 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
+}
+
+
+static void usage() __attribute__ ((noreturn));
+static void usage()
+{
+ version();
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
puts("Prints all arguments that is give to some program using the default files");
printf("Usage: %s [OPTIONS] [groups]\n", my_progname);
@@ -126,12 +130,13 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
exit(0);
case 'I':
case '?':
- usage(0);
+ usage();
case 'v':
verbose++;
break;
case 'V':
- usage(1);
+ version();
+ /* fall through */
case '#':
DBUG_PUSH(argument ? argument : default_dbug_option);
break;
@@ -179,7 +184,7 @@ int main(int argc, char **argv)
nargs+= array_elements(mysqld_groups);
if (nargs < 2)
- usage(0);
+ usage();
load_default_groups=(char**) my_malloc(nargs*sizeof(char*), MYF(MY_WME));
if (!load_default_groups)
diff --git a/extra/replace.c b/extra/replace.c
index 56cf02f..2ad4979 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -174,6 +174,7 @@ register char **argv[];
break;
case 'V':
version=1;
+ /* fall through */
case 'I':
case '?':
help=1; /* Help text written */
diff --git a/extra/yassl/README b/extra/yassl/README
index a3d4f60..de1bf51 100644
--- a/extra/yassl/README
+++ b/extra/yassl/README
@@ -12,6 +12,14 @@ before calling SSL_new();
*** end Note ***
+yaSSL Release notes, version 2.4.4 (8/8/2017)
+ This release of yaSSL fixes an interop issue. A fix for detecting cipher
+ suites with non leading zeros is included as yaSSL only supports cipher
+ suites with leading zeros. Thanks for the report from Security Innovation
+ and Oracle.
+
+ Users interoping with other SSL stacks should update.
+
yaSSL Release notes, version 2.4.2 (9/22/2016)
This release of yaSSL fixes a medium security vulnerability. A fix for
potential AES side channel leaks is included that a local user monitoring
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
index 0609dfc..0cce783 100644
--- a/extra/yassl/include/openssl/ssl.h
+++ b/extra/yassl/include/openssl/ssl.h
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
Use is subject to license terms.
This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
#include "rsa.h"
-#define YASSL_VERSION "2.4.2"
+#define YASSL_VERSION "2.4.4"
#if defined(__cplusplus)
diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp
index 5158bd2..85bf0af 100644
--- a/extra/yassl/src/yassl_imp.cpp
+++ b/extra/yassl/src/yassl_imp.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005, 2014, Oracle and/or its affiliates
+ Copyright (c) 2005, 2017, Oracle and/or its affiliates.
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
@@ -1578,6 +1578,10 @@ void ServerHello::Process(input_buffer& input, SSL& ssl)
ssl.SetError(badVersion_error);
return;
}
+ if (cipher_suite_[0] != 0x00) {
+ ssl.SetError(unknown_cipher);
+ return;
+ }
ssl.set_pending(cipher_suite_[1]);
ssl.set_random(random_, server_end);
if (id_len_)
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index 215628c..312c004 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2005, 2014, Oracle and/or its affiliates
+ Copyright (c) 2005, 2017, Oracle and/or its affiliates.
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
@@ -1399,12 +1399,17 @@ void SSL::matchSuite(const opaque* peer, uint length)
// start with best, if a match we are good, Ciphers are at odd index
// since all SSL and TLS ciphers have 0x00 first byte
for (uint i = 1; i < secure_.get_parms().suites_size_; i += 2)
- for (uint j = 1; j < length; j+= 2)
- if (secure_.use_parms().suites_[i] == peer[j]) {
+ for (uint j = 0; (j + 1) < length; j+= 2) {
+ if (peer[j] != 0x00) {
+ continue; // only 0x00 first byte supported
+ }
+
+ if (secure_.use_parms().suites_[i] == peer[j + 1]) {
secure_.use_parms().suite_[0] = 0x00;
- secure_.use_parms().suite_[1] = peer[j];
+ secure_.use_parms().suite_[1] = peer[j + 1];
return;
}
+ }
SetError(match_error);
}
@@ -2706,4 +2711,3 @@ template mySTL::list<yaSSL::SSL_SESSION*>::iterator find_if<mySTL::list<yaSSL::S
template mySTL::list<yaSSL::ThreadError>::iterator find_if<mySTL::list<yaSSL::ThreadError>::iterator, yaSSL::yassl_int_cpp_local2::thr_match>(mySTL::list<yaSSL::ThreadError>::iterator, mySTL::list<yaSSL::ThreadError>::iterator, yaSSL::yassl_int_cpp_local2::thr_match);
}
#endif
-
diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
index 9246c18..d68faaf 100644
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
@@ -66,6 +66,13 @@ if (!$slave_skip_counter) {
}
source include/start_slave.inc;
+# start_slave.inc returns when Slave_SQL_Running=Yes. But the slave
+# thread sets it before clearing Last_SQL_Errno. So we have to wait
+# for Last_SQL_Errno=0 separately.
+
+let $slave_param= Last_SQL_Errno;
+let $slave_param_value= 0;
+source include/wait_for_slave_param.inc;
--let $include_filename= wait_for_slave_sql_error_and_skip.inc [errno=$slave_sql_errno]
--source include/end_include_file.inc
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 5beb295..7bd86e6 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -738,8 +738,7 @@ sub run_test_server ($$$) {
# Repeat test $opt_repeat number of times
my $repeat= $result->{repeat} || 1;
- # Don't repeat if test was skipped
- if ($repeat < $opt_repeat && $result->{'result'} ne 'MTR_RES_SKIPPED')
+ if ($repeat < $opt_repeat)
{
$result->{retries}= 0;
$result->{rep_failures}++ if $result->{failures};
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 624cc7a..8e61031 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -1340,3 +1340,55 @@ rename table t2 to t1;
execute stmt1;
deallocate prepare stmt1;
drop table t2;
+#
+# MDEV-8960 Can't refer the same column twice in one ALTER TABLE
+#
+CREATE TABLE t1 (
+`a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL,
+ALTER COLUMN `consultant_id` DROP DEFAULT;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `consultant_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+DROP TABLE t1;
+CREATE TABLE t1 (
+`a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL,
+ALTER COLUMN `consultant_id` SET DEFAULT 2;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `consultant_id` int(11) NOT NULL DEFAULT '2'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+DROP TABLE t1;
+CREATE TABLE t1 (
+`a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL DEFAULT 2,
+ALTER COLUMN `consultant_id` DROP DEFAULT;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `consultant_id` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+DROP TABLE t1;
+CREATE TABLE t1 (
+`a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL DEFAULT 2,
+ALTER COLUMN `consultant_id` DROP DEFAULT,
+MODIFY COLUMN `consultant_id` BIGINT;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `consultant_id` bigint(20) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+DROP TABLE t1;
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 274d5da..bf7ec11 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -220,6 +220,22 @@ a d
3 11120436154190595086
drop table t1, t2;
End of 5.0 tests
+#
+# Bug#19875294 ASSERTION `SRC' FAILED IN MY_STRNXFRM_UNICODE
+# (SIG 6 -STRINGS/CTYPE-UTF8.C:5151)
+#
+set @@sql_mode='';
+CREATE TABLE t1(c1 SET('','')CHARACTER SET ucs2);
+Warnings:
+Note 1291 Column 'c1' has duplicated value '' in SET
+INSERT INTO t1 VALUES(990101.102);
+Warnings:
+Warning 1265 Data truncated for column 'c1' at row 1
+SELECT COALESCE(c1)FROM t1 ORDER BY 1;
+COALESCE(c1)
+
+DROP TABLE t1;
+set @@sql_mode=default;
CREATE TABLE t1(a YEAR);
SELECT 1 FROM t1 WHERE a=1 AND CASE 1 WHEN a THEN 1 ELSE 1 END;
1
diff --git a/mysql-test/r/count_distinct.result b/mysql-test/r/count_distinct.result
index d55a232..760b271 100644
--- a/mysql-test/r/count_distinct.result
+++ b/mysql-test/r/count_distinct.result
@@ -106,3 +106,28 @@ count(distinct user_id)
17
drop table t1;
set @@tmp_table_size = default;
+create table t1 (
+a VARCHAR(1020),
+b int
+);
+insert into t1 values
+( 0 , 1 ),
+( 1 , 2 ),
+( 2 , 3 ),
+( 3 , 4 ),
+( 4 , 5 ),
+( 5 , 6 ),
+( 6 , 7 ),
+( 7 , 8 ),
+( 8 , 9 ),
+( 9 , 10 ),
+( 0 , 11 ),
+( 1 , 12 ),
+( 2 , 13 ),
+( 3 , 14 );
+set @@tmp_table_size=1024;
+select count(distinct a) from t1;
+count(distinct a)
+10
+drop table t1;
+set @@tmp_table_size = default;
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index 7a93c55..1bbd3af 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -4367,5 +4367,35 @@ NO_ENGINE_SUBSTITUTION
SET sql_mode=DEFAULT;
SET NAMES utf8;
#
+# MDEV-13972 crash in Item_func_sec_to_time::get_date
+#
+SELECT SEC_TO_TIME(CONVERT(900*24*60*60 USING ucs2));
+SEC_TO_TIME(CONVERT(900*24*60*60 USING ucs2))
+838:59:59.999999
+Warnings:
+Warning 1292 Truncated incorrect time value: '77760000'
+#
+# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+#
+CREATE TABLE t1 (c1 VARCHAR(32766) CHARACTER SET ucs2);
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 varchar(32766) YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(32767) CHARACTER SET ucs2);
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 text YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(32768) CHARACTER SET ucs2);
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 mediumtext YES NULL
+DROP TABLE t1;
+#
# End of 5.5 tests
#
diff --git a/mysql-test/r/ctype_utf32.result b/mysql-test/r/ctype_utf32.result
index 9b062f9..02683bc 100644
--- a/mysql-test/r/ctype_utf32.result
+++ b/mysql-test/r/ctype_utf32.result
@@ -1283,5 +1283,20 @@ NO_ENGINE_SUBSTITUTION
SET sql_mode=DEFAULT;
SET NAMES utf8;
#
+# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+#
+CREATE TABLE t1 (c1 VARCHAR(16383) CHARACTER SET utf32);
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 varchar(16383) YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(16384) CHARACTER SET utf32);
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 mediumtext YES NULL
+DROP TABLE t1;
+#
# End of 5.5 tests
#
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 74fed6a..fee27ef 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -5933,5 +5933,27 @@ Warnings:
SET sql_mode=DEFAULT;
DROP TABLE t1;
#
+# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+#
+CREATE TABLE t1 (c1 VARCHAR(21844) CHARACTER SET utf8);
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 varchar(21844) YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(21845) CHARACTER SET utf8);
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 text YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(21846) CHARACTER SET utf8);
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 mediumtext YES NULL
+DROP TABLE t1;
+#
# End of 5.5 tests
#
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index 23c77d3..d71759c 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/r/errors.result
@@ -27,7 +27,7 @@ create table t1 (a int(256));
ERROR 42000: Display width out of range for 'a' (max = 255)
set sql_mode='traditional';
create table t1 (a varchar(66000));
-ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+ERROR 42000: Column length too big for column 'a' (max = 65532); use BLOB or TEXT instead
set sql_mode=default;
CREATE TABLE t1 (a INT);
SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0)));
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
index fc56660..03ddbf5 100644
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/r/func_in.result
@@ -812,3 +812,9 @@ EXECUTE s;
1
DROP TABLE t1;
# End of 5.3 tests
+create table t1 (a int);
+insert t1 values (1),(2),(3);
+select * from t1 where 1 in (a, name_const('a', null));
+a
+1
+drop table t1;
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index 68b1e0f..cffed8e 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -2626,3 +2626,37 @@ DROP TABLE t1;
SELECT 1 MOD ADDTIME( '13:58:57', '00:00:01' ) + 2;
1 MOD ADDTIME( '13:58:57', '00:00:01' ) + 2
3
+#
+# MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
+#
+SET sql_mode='NO_ZERO_IN_DATE';
+CREATE TABLE t1 (a TIME(6));
+INSERT INTO t1 SELECT timediff(timestamp'2008-12-31 23:59:59.000001',timestamp'2008-12-30 01:01:01.000002');
+SELECT * FROM t1;
+a
+46:58:57.999999
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+#
+# MDEV-13972 crash in Item_func_sec_to_time::get_date
+#
+DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(UUID()))));
+DO TO_DAYS(SEC_TO_TIME(MAKEDATE('',RAND(~('')))));
+Warnings:
+Warning 1292 Truncated incorrect INTEGER value: ''
+Warning 1292 Truncated incorrect INTEGER value: ''
+Warning 1292 Truncated incorrect INTEGER value: ''
+Warning 1292 Truncated incorrect time value: '20000101'
+SELECT TO_DAYS(SEC_TO_TIME(MAKEDATE(0,RAND(~0))));
+TO_DAYS(SEC_TO_TIME(MAKEDATE(0,RAND(~0))))
+0
+Warnings:
+Warning 1292 Truncated incorrect time value: '20000101'
+SELECT SEC_TO_TIME(MAKEDATE(0,RAND(~0)));
+SEC_TO_TIME(MAKEDATE(0,RAND(~0)))
+838:59:59
+Warnings:
+Warning 1292 Truncated incorrect time value: '20000101'
+#
+# End of 5.5 tests
+#
diff --git a/mysql-test/r/log_tables-big.result b/mysql-test/r/log_tables-big.result
index 1e189a7..4435d6d 100644
--- a/mysql-test/r/log_tables-big.result
+++ b/mysql-test/r/log_tables-big.result
@@ -1,3 +1,4 @@
+set @log_output.saved = @@global.log_output;
set @@global.log_output = 'TABLE';
set session long_query_time=10;
select get_lock('bug27638', 1);
@@ -7,25 +8,25 @@ set session long_query_time=1;
select get_lock('bug27638', 2);
get_lock('bug27638', 2)
0
-select if (query_time >= '00:00:01', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:01', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 2)';
qt sql_text
OK select get_lock('bug27638', 2)
select get_lock('bug27638', 60);
get_lock('bug27638', 60)
0
-select if (query_time >= '00:00:59', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:59', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 60)';
qt sql_text
OK select get_lock('bug27638', 60)
select get_lock('bug27638', 101);
get_lock('bug27638', 101)
0
-select if (query_time >= '00:01:40', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:01:40', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 101)';
qt sql_text
OK select get_lock('bug27638', 101)
select release_lock('bug27638');
release_lock('bug27638')
1
-set @@global.log_output=default;
+set @@global.log_output = @log_output.saved;
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 85af643..81a2001 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1697,7 +1697,14 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 (v varchar(65535));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+Warnings:
+Note 1246 Converting column 'v' from VARCHAR to TEXT
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `v` text
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
set storage_engine=MyISAM;
set @save_concurrent_insert=@@concurrent_insert;
set global concurrent_insert=1;
diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/r/partition_datatype.result
index 1151a1c..879b603 100644
--- a/mysql-test/r/partition_datatype.result
+++ b/mysql-test/r/partition_datatype.result
@@ -314,12 +314,14 @@ bbbb
drop table t1;
create table t1 (a varchar(3070)) partition by key (a);
ERROR HY000: The total length of the partitioning fields is too large
+create table t1 (a varchar(65532) not null) partition by key (a);
+ERROR HY000: The total length of the partitioning fields is too large
create table t1 (a varchar(65533)) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR HY000: A BLOB field is not allowed in partition function
create table t1 (a varchar(65534) not null) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR HY000: A BLOB field is not allowed in partition function
create table t1 (a varchar(65535)) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR HY000: A BLOB field is not allowed in partition function
create table t1 (a bit(27), primary key (a)) engine=myisam
partition by hash (a)
(partition p0, partition p1, partition p2);
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index f954583..3fed0a5 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -4173,4 +4173,147 @@ Warnings:
Note 1003 select `test`.`t1`.`id` AS `id`,`test`.`t1`.`c` AS `c` from `test`.`t1` where 0
deallocate prepare stmt2;
drop table t1;
+#
+# MDEV-9208: Function->Function->View = Mysqld segfault
+# (Server crashes in Dependency_marker::visit_field on 2nd
+# execution with merged subquery)
+#
+CREATE TABLE t1 (i1 INT);
+insert into t1 values(1),(2);
+CREATE TABLE t2 (i2 INT);
+insert into t2 values(1),(2);
+prepare stmt from "
+ select 1 from (
+ select
+ if (i1<0, 0, 0) as f1,
+ (select f1) as f2
+ from t1, t2
+ ) sq
+";
+execute stmt;
+1
+1
+1
+1
+1
+execute stmt;
+1
+1
+1
+1
+1
+drop table t1,t2;
+#
+# MDEV-9619: Assertion `null_ref_table' failed in virtual
+# table_map Item_direct_view_ref::used_tables() const on 2nd
+# execution of PS
+#
+CREATE TABLE t1 (f1 VARCHAR(10)) ENGINE=MyISAM;
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES ('a'),('b');
+CREATE TABLE t2 (f2 VARCHAR(10)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('c'),('d');
+PREPARE stmt FROM "SELECT * FROM v1 WHERE f1 = SOME ( SELECT f2 FROM t2 )";
+EXECUTE stmt;
+f1
+EXECUTE stmt;
+f1
+insert into t1 values ('c');
+EXECUTE stmt;
+f1
+c
+EXECUTE stmt;
+f1
+c
+deallocate prepare stmt;
+drop view v1;
+drop table t1,t2;
+CREATE TABLE t1 (f1 VARCHAR(10)) ENGINE=MyISAM;
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES ('a'),('b');
+CREATE TABLE t2 (f2 VARCHAR(10)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('c'),('d');
+PREPARE stmt FROM "SELECT * FROM v1 WHERE (f1,f1) = SOME ( SELECT f2,f2 FROM t2 )";
+EXECUTE stmt;
+f1
+EXECUTE stmt;
+f1
+insert into t1 values ('c');
+EXECUTE stmt;
+f1
+c
+EXECUTE stmt;
+f1
+c
+deallocate prepare stmt;
+drop view v1;
+drop table t1,t2;
+CREATE TABLE t1 (column1 INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (3),(9);
+CREATE TABLE t2 (column2 INT) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (1),(4);
+CREATE TABLE t3 (column3 INT) ENGINE=MyISAM;
+INSERT INTO t3 VALUES (6),(8);
+CREATE TABLE t4 (column4 INT) ENGINE=MyISAM;
+INSERT INTO t4 VALUES (2),(5);
+PREPARE stmt FROM "
+SELECT (
+ SELECT MAX( table1.column1 ) AS field1
+ FROM t1 AS table1
+ WHERE (111,table3.column3) IN ( SELECT 111,table2.column2 AS field2 FROM t2 AS table2 )
+) AS sq
+FROM t3 AS table3, t4 AS table4 GROUP BY sq
+";
+EXECUTE stmt;
+sq
+NULL
+EXECUTE stmt;
+sq
+NULL
+deallocate prepare stmt;
+drop table t1,t2,t3,t4;
+create table t1 (a int, b int, c int);
+create table t2 (x int, y int, z int);
+create table t3 as select * from t1;
+insert into t1 values (1,2,3),(4,5,6),(100,200,300),(400,500,600);
+insert into t2 values (1,2,3),(7,8,9),(100,200,300),(400,500,600);
+insert into t3 values (1,2,3),(11,12,13),(100,0,0),(400,500,600);
+set @optimizer_switch_save=@@optimizer_switch;
+set @join_cache_level_save=@@join_cache_level;
+set optimizer_switch='materialization=off';
+set join_cache_level=0;
+select * from t1 where (select a,b from t3 where t3.c=t1.c) in (select x,y from t2 where t1.c= t2.z);
+a b c
+1 2 3
+400 500 600
+prepare stmt from "select * from t1 where (select a,b from t3 where t3.c=t1.c) in (select x,y from t2 where t1.c= t2.z)";
+EXECUTE stmt;
+a b c
+1 2 3
+400 500 600
+EXECUTE stmt;
+a b c
+1 2 3
+400 500 600
+create view v1 as select * from t1;
+create view v2 as select * from t2;
+create view v3 as select * from t3;
+select * from v1 where (select a,b from v3 where v3.c=v1.c) in (select x,y from v2 where v1.c= v2.z);
+a b c
+1 2 3
+400 500 600
+prepare stmt from "select * from v1 where (select a,b from v3 where v3.c=v1.c) in (select x,y from v2 where v1.c= v2.z)";
+EXECUTE stmt;
+a b c
+1 2 3
+400 500 600
+EXECUTE stmt;
+a b c
+1 2 3
+400 500 600
+set optimizer_switch=@optimizer_switch_save;
+set join_cache_level=@join_cache_level_save;
+deallocate prepare stmt;
+drop view v1,v2,v3;
+drop table t1,t2,t3;
# End of 5.5 tests
diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index 807dc42..2d0f9d7 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -47,6 +47,9 @@ delete t1 from t1,t3 where t1.a=t3.a;
drop table t1;
insert into t1 values(1);
ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement
+drop temporary table if exists t1;
+Warnings:
+Note 1051 Unknown table 't1'
connection default;
set global read_only=0;
lock table t1 write;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 0e4cf6c..8d4c3fe 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -959,7 +959,7 @@ def information_schema COLUMNS COLUMNS TABLE_CATALOG TABLE_CATALOG 253 1536 3 N
def information_schema COLUMNS COLUMNS TABLE_SCHEMA TABLE_SCHEMA 253 192 4 N 1 0 33
def information_schema COLUMNS COLUMNS TABLE_NAME TABLE_NAME 253 192 2 N 1 0 33
def information_schema COLUMNS COLUMNS COLUMN_NAME COLUMN_NAME 253 192 1 N 1 0 33
-def information_schema COLUMNS COLUMNS COLUMN_DEFAULT COLUMN_DEFAULT 252 589815 0 Y 16 0 33
+def information_schema COLUMNS COLUMNS COLUMN_DEFAULT COLUMN_DEFAULT 252 589788 0 Y 16 0 33
def information_schema COLUMNS COLUMNS IS_NULLABLE IS_NULLABLE 253 9 2 N 1 0 33
def information_schema COLUMNS COLUMNS DATA_TYPE DATA_TYPE 253 192 3 N 1 0 33
def information_schema COLUMNS COLUMNS CHARACTER_SET_NAME CHARACTER_SET_NAME 253 96 0 Y 0 0 33
@@ -984,7 +984,7 @@ def information_schema COLUMNS COLUMNS COLUMN_NAME Field 253 192 1 N 1 0 33
def information_schema COLUMNS COLUMNS COLUMN_TYPE Type 252 589815 7 N 17 0 33
def information_schema COLUMNS COLUMNS IS_NULLABLE Null 253 9 2 N 1 0 33
def information_schema COLUMNS COLUMNS COLUMN_KEY Key 253 9 3 N 1 0 33
-def information_schema COLUMNS COLUMNS COLUMN_DEFAULT Default 252 589815 0 Y 16 0 33
+def information_schema COLUMNS COLUMNS COLUMN_DEFAULT Default 252 589788 0 Y 16 0 33
def information_schema COLUMNS COLUMNS EXTRA Extra 253 81 0 N 1 0 33
Field Type Null Key Default Extra
c int(11) NO PRI NULL
diff --git a/mysql-test/r/show_function_with_pad_char_to_full_length.result b/mysql-test/r/show_function_with_pad_char_to_full_length.result
new file mode 100644
index 0000000..785cab7
--- /dev/null
+++ b/mysql-test/r/show_function_with_pad_char_to_full_length.result
@@ -0,0 +1,24 @@
+create function f() returns int return 1;
+show function status;
+Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
+T f T T T T T T T T T
+set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH';
+show function status;
+Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
+T f T T T T T T T T T
+drop function f;
+select @@sql_mode;
+@@sql_mode
+PAD_CHAR_TO_FULL_LENGTH
+create function f() returns int return 1;
+select ROUTINE_NAME from information_schema.ROUTINES where ROUTINE_NAME='f';
+ROUTINE_NAME
+f
+set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH';
+select ROUTINE_NAME from information_schema.ROUTINES where ROUTINE_NAME='f';
+ROUTINE_NAME
+f
+drop function f;
+select @@sql_mode;
+@@sql_mode
+PAD_CHAR_TO_FULL_LENGTH
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index da3c658..a3262ca 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -1240,9 +1240,9 @@ Warning 1364 Field 'i' doesn't have a default value
DROP TABLE t1;
set @@sql_mode='traditional';
create table t1(a varchar(65537));
-ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+ERROR 42000: Column length too big for column 'a' (max = 65532); use BLOB or TEXT instead
create table t1(a varbinary(65537));
-ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+ERROR 42000: Column length too big for column 'a' (max = 65532); use BLOB or TEXT instead
set @@sql_mode='traditional';
create table t1(a int, b date not null);
alter table t1 modify a bigint unsigned not null;
diff --git a/mysql-test/r/subselect_mat_cost_bugs.result b/mysql-test/r/subselect_mat_cost_bugs.result
index 57b0526..df6b543 100644
--- a/mysql-test/r/subselect_mat_cost_bugs.result
+++ b/mysql-test/r/subselect_mat_cost_bugs.result
@@ -502,3 +502,20 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 index idx idx 5 NULL 5 Using where; Using index
2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
drop table t1;
+#
+# MDEV-13135: subquery with ON expression subject to
+# semi-join optimizations
+#
+CREATE TABLE t1 (a INT);
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT a AS v_a FROM t1;
+INSERT INTO t1 VALUES (1),(3);
+CREATE TABLE t2 (b INT, KEY(b));
+INSERT INTO t2 VALUES (3),(4);
+SELECT * FROM t1 WHERE a NOT IN (
+SELECT b FROM t2 INNER JOIN v1 ON (b IN ( SELECT a FROM t1 ))
+WHERE v_a = b
+);
+a
+1
+DROP VIEW v1;
+DROP TABLE t1,t2;
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index f49b2a7..9b20dde 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -37,7 +37,7 @@ ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT
CREATE TABLE t2 (a char(256));
ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE t1 (a varchar(70000) default "hello");
-ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+ERROR 42000: Column length too big for column 'a' (max = 65532); use BLOB or TEXT instead
CREATE TABLE t2 (a blob default "hello");
ERROR 42000: BLOB/TEXT column 'a' can't have a default value
drop table if exists t1,t2;
diff --git a/mysql-test/r/type_varchar.result b/mysql-test/r/type_varchar.result
index 38ed8a4..0ab13be 100644
--- a/mysql-test/r/type_varchar.result
+++ b/mysql-test/r/type_varchar.result
@@ -510,3 +510,72 @@ SELECT 5 = a FROM t1;
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 's '
DROP TABLE t1;
+#
+# MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+#
+CREATE TABLE t1 (c1 VARBINARY(65532));
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 varbinary(65532) YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARBINARY(65533));
+Warnings:
+Note 1246 Converting column 'c1' from VARBINARY to BLOB
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 blob YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARBINARY(65534));
+Warnings:
+Note 1246 Converting column 'c1' from VARBINARY to BLOB
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 blob YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARBINARY(65535));
+Warnings:
+Note 1246 Converting column 'c1' from VARBINARY to BLOB
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 blob YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARBINARY(65536));
+Warnings:
+Note 1246 Converting column 'c1' from VARBINARY to BLOB
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 mediumblob YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(65532));
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 varchar(65532) YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(65533));
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 text YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(65534));
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 text YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(65535));
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 text YES NULL
+DROP TABLE t1;
+CREATE TABLE t1 (c1 VARCHAR(65536));
+Warnings:
+Note 1246 Converting column 'c1' from VARCHAR to TEXT
+DESCRIBE t1;
+Field Type Null Key Default Extra
+c1 mediumtext YES NULL
+DROP TABLE t1;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 0f8e999..c1f76ba 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -5626,9 +5626,6 @@ CREATE TABLE t3 (a INT);
CREATE ALGORITHM = MERGE VIEW v1 AS SELECT t2.a FROM t3 AS t1, t3 AS t2;
CREATE ALGORITHM = MERGE VIEW v2 AS SELECT * FROM v1;
PREPARE stmt FROM 'REPLACE INTO v2 SELECT a FROM t3';
-EXECUTE stmt;
-ERROR HY000: Can not insert into join view 'test.v2' without fields list
-EXECUTE stmt;
ERROR HY000: Can not insert into join view 'test.v2' without fields list
drop view v1,v2;
drop table t3;
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index 0de42a9..890f6bb 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -1586,7 +1586,14 @@ t1 CREATE TABLE `t1` (
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
drop table t1;
create table t1 (v varchar(65535));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+Warnings:
+Note 1246 Converting column 'v' from VARCHAR to TEXT
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `v` text
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+drop table t1;
set @save_concurrent_insert=@@concurrent_insert;
set global concurrent_insert=1;
create table t1 (a int) ROW_FORMAT=FIXED;
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
index 3fa7d75..b6a3e27 100644
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -924,8 +924,9 @@ show create table t1;
drop table t1;
# ARIA specific varchar tests
---error 1118
create table t1 (v varchar(65535));
+show create table t1;
+drop table t1;
#
# Test concurrent insert
diff --git a/mysql-test/suite/parts/r/partition_alter_maria.result b/mysql-test/suite/parts/r/partition_alter_maria.result
new file mode 100644
index 0000000..6343566
--- /dev/null
+++ b/mysql-test/suite/parts/r/partition_alter_maria.result
@@ -0,0 +1,18 @@
+create table t1 (
+pk bigint not null auto_increment,
+dt datetime default null,
+unique (pk, dt)
+) engine=aria row_format=dynamic
+partition by range columns(dt) (
+partition `p20171231` values less than ('2017-12-31'),
+partition `p20181231` values less than ('2018-12-31')
+);
+insert into t1 values (1,'2017-09-28 15:12:00');
+select * from t1;
+pk dt
+1 2017-09-28 15:12:00
+alter table t1 drop partition p20181231;
+select * from t1;
+pk dt
+1 2017-09-28 15:12:00
+drop table t1;
diff --git a/mysql-test/suite/parts/t/partition_alter_maria.test b/mysql-test/suite/parts/t/partition_alter_maria.test
new file mode 100644
index 0000000..db24959
--- /dev/null
+++ b/mysql-test/suite/parts/t/partition_alter_maria.test
@@ -0,0 +1,18 @@
+#
+# MDEV-13937 Aria engine: Internal Error 160 after partition handling
+#
+source include/have_partition.inc;
+create table t1 (
+ pk bigint not null auto_increment,
+ dt datetime default null,
+ unique (pk, dt)
+) engine=aria row_format=dynamic
+ partition by range columns(dt) (
+ partition `p20171231` values less than ('2017-12-31'),
+ partition `p20181231` values less than ('2018-12-31')
+);
+insert into t1 values (1,'2017-09-28 15:12:00');
+select * from t1;
+alter table t1 drop partition p20181231;
+select * from t1;
+drop table t1;
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index 699b6d4..0a8d87d 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -337,3 +337,22 @@ tsv timestamp as (adddate(ts, interval 1 day)) virtual
);
drop table t1;
set sql_mode=default;
+#
+# MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
+#
+SET sql_mode='NO_ZERO_IN_DATE';
+CREATE TABLE t1
+(
+a datetime DEFAULT NULL,
+b datetime DEFAULT NULL,
+c time GENERATED ALWAYS AS (timediff(`a`,`b`)) VIRTUAL
+);
+INSERT INTO t1 VALUES ('2008-12-31 23:59:59.000001','2008-12-30 01:01:01.000002',DEFAULT);
+SELECT * FROM t1;
+a b c
+2008-12-31 23:59:59 2008-12-30 01:01:01 46:58:58
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+#
+# End of 5.5 tests
+#
diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test
index 80a36d9..1ac0b4f 100644
--- a/mysql-test/suite/vcol/t/vcol_misc.test
+++ b/mysql-test/suite/vcol/t/vcol_misc.test
@@ -301,3 +301,23 @@ create table t1 (
);
drop table t1;
set sql_mode=default;
+
+--echo #
+--echo # MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
+--echo #
+
+SET sql_mode='NO_ZERO_IN_DATE';
+CREATE TABLE t1
+(
+ a datetime DEFAULT NULL,
+ b datetime DEFAULT NULL,
+ c time GENERATED ALWAYS AS (timediff(`a`,`b`)) VIRTUAL
+);
+INSERT INTO t1 VALUES ('2008-12-31 23:59:59.000001','2008-12-30 01:01:01.000002',DEFAULT);
+SELECT * FROM t1;
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+
+--echo #
+--echo # End of 5.5 tests
+--echo #
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index eade7ba..ee9616e 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -1231,3 +1231,44 @@ execute stmt1;
deallocate prepare stmt1;
drop table t2;
+--echo #
+--echo # MDEV-8960 Can't refer the same column twice in one ALTER TABLE
+--echo #
+
+CREATE TABLE t1 (
+ `a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL,
+ALTER COLUMN `consultant_id` DROP DEFAULT;
+
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+ `a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL,
+ALTER COLUMN `consultant_id` SET DEFAULT 2;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+ `a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL DEFAULT 2,
+ALTER COLUMN `consultant_id` DROP DEFAULT;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+ `a` int(11) DEFAULT NULL
+) DEFAULT CHARSET=utf8;
+
+ALTER TABLE t1 ADD COLUMN `consultant_id` integer NOT NULL DEFAULT 2,
+ALTER COLUMN `consultant_id` DROP DEFAULT,
+MODIFY COLUMN `consultant_id` BIGINT;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
diff --git a/mysql-test/t/case.test b/mysql-test/t/case.test
index c127836..e077b1c 100644
--- a/mysql-test/t/case.test
+++ b/mysql-test/t/case.test
@@ -174,6 +174,18 @@ drop table t1, t2;
--echo End of 5.0 tests
+--echo #
+--echo # Bug#19875294 ASSERTION `SRC' FAILED IN MY_STRNXFRM_UNICODE
+--echo # (SIG 6 -STRINGS/CTYPE-UTF8.C:5151)
+--echo #
+
+set @@sql_mode='';
+CREATE TABLE t1(c1 SET('','')CHARACTER SET ucs2);
+INSERT INTO t1 VALUES(990101.102);
+SELECT COALESCE(c1)FROM t1 ORDER BY 1;
+DROP TABLE t1;
+set @@sql_mode=default;
+
#
# lp:1001510
# Bug #11764313 57135: CRASH IN ITEM_FUNC_CASE::FIND_ITEM WITH CASE WHEN
diff --git a/mysql-test/t/count_distinct.test b/mysql-test/t/count_distinct.test
index a00574b..86045e8 100644
--- a/mysql-test/t/count_distinct.test
+++ b/mysql-test/t/count_distinct.test
@@ -121,5 +121,34 @@ drop table t1;
set @@tmp_table_size = default;
#
+# MDEV-13457: Wrong result for aggregate function with distinct clause when the value for
+# tmp_table_size is small
+#
+
+create table t1 (
+a VARCHAR(1020),
+b int
+);
+insert into t1 values
+( 0 , 1 ),
+( 1 , 2 ),
+( 2 , 3 ),
+( 3 , 4 ),
+( 4 , 5 ),
+( 5 , 6 ),
+( 6 , 7 ),
+( 7 , 8 ),
+( 8 , 9 ),
+( 9 , 10 ),
+( 0 , 11 ),
+( 1 , 12 ),
+( 2 , 13 ),
+( 3 , 14 );
+set @@tmp_table_size=1024;
+select count(distinct a) from t1;
+drop table t1;
+set @@tmp_table_size = default;
+
+#
# End of 5.5 tests
#
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index d94c9ae..b3d0be4 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -863,5 +863,28 @@ SET sql_mode=DEFAULT;
SET NAMES utf8;
--echo #
+--echo # MDEV-13972 crash in Item_func_sec_to_time::get_date
+--echo #
+
+SELECT SEC_TO_TIME(CONVERT(900*24*60*60 USING ucs2));
+
+--echo #
+--echo # MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+--echo #
+
+CREATE TABLE t1 (c1 VARCHAR(32766) CHARACTER SET ucs2);
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(32767) CHARACTER SET ucs2);
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(32768) CHARACTER SET ucs2);
+DESCRIBE t1;
+DROP TABLE t1;
+
+
+--echo #
--echo # End of 5.5 tests
--echo #
diff --git a/mysql-test/t/ctype_utf32.test b/mysql-test/t/ctype_utf32.test
index 2b3d3b3..fced283 100644
--- a/mysql-test/t/ctype_utf32.test
+++ b/mysql-test/t/ctype_utf32.test
@@ -891,5 +891,18 @@ SET sql_mode=DEFAULT;
SET NAMES utf8;
--echo #
+--echo # MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+--echo #
+
+CREATE TABLE t1 (c1 VARCHAR(16383) CHARACTER SET utf32);
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(16384) CHARACTER SET utf32);
+DESCRIBE t1;
+DROP TABLE t1;
+
+
+--echo #
--echo # End of 5.5 tests
--echo #
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index 75581ed..592e3a3 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1696,5 +1696,21 @@ SET sql_mode=DEFAULT;
DROP TABLE t1;
--echo #
+--echo # MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+--echo #
+
+CREATE TABLE t1 (c1 VARCHAR(21844) CHARACTER SET utf8);
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(21845) CHARACTER SET utf8);
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(21846) CHARACTER SET utf8);
+DESCRIBE t1;
+DROP TABLE t1;
+
+--echo #
--echo # End of 5.5 tests
--echo #
diff --git a/mysql-test/t/func_in.test b/mysql-test/t/func_in.test
index 1e69514..439f986 100644
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/t/func_in.test
@@ -606,3 +606,11 @@ EXECUTE s;
DROP TABLE t1;
--echo # End of 5.3 tests
+
+#
+# Bug#26361149 MYSQL SERVER CRASHES AT: COL IN(IFNULL(CONST, COL), NAME_CONST('NAME', NULL))
+#
+create table t1 (a int);
+insert t1 values (1),(2),(3);
+select * from t1 where 1 in (a, name_const('a', null));
+drop table t1;
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
index 92e1c38..8323bd3 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -1602,3 +1602,34 @@ DROP TABLE t1;
--echo # MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
--echo #
SELECT 1 MOD ADDTIME( '13:58:57', '00:00:01' ) + 2;
+
+
+--echo #
+--echo # MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
+--echo #
+
+SET sql_mode='NO_ZERO_IN_DATE';
+CREATE TABLE t1 (a TIME(6));
+INSERT INTO t1 SELECT timediff(timestamp'2008-12-31 23:59:59.000001',timestamp'2008-12-30 01:01:01.000002');
+SELECT * FROM t1;
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+
+
+--echo #
+--echo # MDEV-13972 crash in Item_func_sec_to_time::get_date
+--echo #
+
+# The below query can return warning sporadically
+--disable_warnings
+DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(UUID()))));
+--enable_warnings
+
+DO TO_DAYS(SEC_TO_TIME(MAKEDATE('',RAND(~('')))));
+SELECT TO_DAYS(SEC_TO_TIME(MAKEDATE(0,RAND(~0))));
+SELECT SEC_TO_TIME(MAKEDATE(0,RAND(~0)));
+
+
+--echo #
+--echo # End of 5.5 tests
+--echo #
diff --git a/mysql-test/t/log_tables-big.test b/mysql-test/t/log_tables-big.test
index 8936a16..fa8810e 100644
--- a/mysql-test/t/log_tables-big.test
+++ b/mysql-test/t/log_tables-big.test
@@ -7,6 +7,7 @@
# check that CSV engine was compiled in
--source include/have_csv.inc
+set @log_output.saved = @@global.log_output;
set @@global.log_output = 'TABLE';
connect (con1,localhost,root,,);
@@ -21,13 +22,13 @@ select get_lock('bug27638', 1);
connection con2;
set session long_query_time=1;
select get_lock('bug27638', 2);
-select if (query_time >= '00:00:01', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:01', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 2)';
select get_lock('bug27638', 60);
-select if (query_time >= '00:00:59', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:00:59', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 60)';
select get_lock('bug27638', 101);
-select if (query_time >= '00:01:40', 'OK', 'WRONG') as qt, sql_text from mysql.slow_log
+select if (query_time >= '00:01:40', 'OK', concat('WRONG: ',query_time)) as qt, sql_text from mysql.slow_log
where sql_text = 'select get_lock(\'bug27638\', 101)';
connection con1;
select release_lock('bug27638');
@@ -36,4 +37,4 @@ connection default;
disconnect con1;
disconnect con2;
-set @@global.log_output=default;
+set @@global.log_output = @log_output.saved;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 43c12b4..c4bb93b 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1030,8 +1030,9 @@ show create table t1;
drop table t1;
# MyISAM specific varchar tests
---error 1118
create table t1 (v varchar(65535));
+show create table t1;
+drop table t1;
eval set storage_engine=$default;
diff --git a/mysql-test/t/partition_datatype.test b/mysql-test/t/partition_datatype.test
index a6035fc..4ec0232 100644
--- a/mysql-test/t/partition_datatype.test
+++ b/mysql-test/t/partition_datatype.test
@@ -217,11 +217,13 @@ select * from t1 where a = 'bbbb';
drop table t1;
-- error ER_PARTITION_FIELDS_TOO_LONG
create table t1 (a varchar(3070)) partition by key (a);
--- error ER_TOO_BIG_ROWSIZE
+-- error ER_PARTITION_FIELDS_TOO_LONG
+create table t1 (a varchar(65532) not null) partition by key (a);
+-- error ER_BLOB_FIELD_IN_PART_FUNC_ERROR
create table t1 (a varchar(65533)) partition by key (a);
--- error ER_TOO_BIG_ROWSIZE
+-- error ER_BLOB_FIELD_IN_PART_FUNC_ERROR
create table t1 (a varchar(65534) not null) partition by key (a);
--- error ER_TOO_BIG_ROWSIZE
+-- error ER_BLOB_FIELD_IN_PART_FUNC_ERROR
create table t1 (a varchar(65535)) partition by key (a);
#
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index cfd810f..4431f72 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -3714,4 +3714,133 @@ deallocate prepare stmt2;
drop table t1;
+--echo #
+--echo # MDEV-9208: Function->Function->View = Mysqld segfault
+--echo # (Server crashes in Dependency_marker::visit_field on 2nd
+--echo # execution with merged subquery)
+--echo #
+
+CREATE TABLE t1 (i1 INT);
+insert into t1 values(1),(2);
+
+CREATE TABLE t2 (i2 INT);
+insert into t2 values(1),(2);
+
+prepare stmt from "
+ select 1 from (
+ select
+ if (i1<0, 0, 0) as f1,
+ (select f1) as f2
+ from t1, t2
+ ) sq
+";
+
+execute stmt;
+execute stmt;
+
+drop table t1,t2;
+
+--echo #
+--echo # MDEV-9619: Assertion `null_ref_table' failed in virtual
+--echo # table_map Item_direct_view_ref::used_tables() const on 2nd
+--echo # execution of PS
+--echo #
+
+CREATE TABLE t1 (f1 VARCHAR(10)) ENGINE=MyISAM;
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES ('a'),('b');
+
+CREATE TABLE t2 (f2 VARCHAR(10)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('c'),('d');
+
+PREPARE stmt FROM "SELECT * FROM v1 WHERE f1 = SOME ( SELECT f2 FROM t2 )";
+EXECUTE stmt;
+EXECUTE stmt;
+insert into t1 values ('c');
+EXECUTE stmt;
+EXECUTE stmt;
+
+deallocate prepare stmt;
+drop view v1;
+drop table t1,t2;
+
+CREATE TABLE t1 (f1 VARCHAR(10)) ENGINE=MyISAM;
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES ('a'),('b');
+
+CREATE TABLE t2 (f2 VARCHAR(10)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES ('c'),('d');
+
+PREPARE stmt FROM "SELECT * FROM v1 WHERE (f1,f1) = SOME ( SELECT f2,f2 FROM t2 )";
+EXECUTE stmt;
+EXECUTE stmt;
+insert into t1 values ('c');
+EXECUTE stmt;
+EXECUTE stmt;
+
+deallocate prepare stmt;
+drop view v1;
+drop table t1,t2;
+
+
+
+CREATE TABLE t1 (column1 INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (3),(9);
+
+CREATE TABLE t2 (column2 INT) ENGINE=MyISAM;
+
+INSERT INTO t2 VALUES (1),(4);
+
+CREATE TABLE t3 (column3 INT) ENGINE=MyISAM;
+INSERT INTO t3 VALUES (6),(8);
+
+CREATE TABLE t4 (column4 INT) ENGINE=MyISAM;
+INSERT INTO t4 VALUES (2),(5);
+
+PREPARE stmt FROM "
+SELECT (
+ SELECT MAX( table1.column1 ) AS field1
+ FROM t1 AS table1
+ WHERE (111,table3.column3) IN ( SELECT 111,table2.column2 AS field2 FROM t2 AS table2 )
+) AS sq
+FROM t3 AS table3, t4 AS table4 GROUP BY sq
+";
+
+EXECUTE stmt;
+EXECUTE stmt;
+
+deallocate prepare stmt;
+drop table t1,t2,t3,t4;
+
+create table t1 (a int, b int, c int);
+create table t2 (x int, y int, z int);
+create table t3 as select * from t1;
+insert into t1 values (1,2,3),(4,5,6),(100,200,300),(400,500,600);
+insert into t2 values (1,2,3),(7,8,9),(100,200,300),(400,500,600);
+insert into t3 values (1,2,3),(11,12,13),(100,0,0),(400,500,600);
+
+
+set @optimizer_switch_save=@@optimizer_switch;
+set @join_cache_level_save=@@join_cache_level;
+set optimizer_switch='materialization=off';
+set join_cache_level=0;
+select * from t1 where (select a,b from t3 where t3.c=t1.c) in (select x,y from t2 where t1.c= t2.z);
+prepare stmt from "select * from t1 where (select a,b from t3 where t3.c=t1.c) in (select x,y from t2 where t1.c= t2.z)";
+EXECUTE stmt;
+EXECUTE stmt;
+
+create view v1 as select * from t1;
+create view v2 as select * from t2;
+create view v3 as select * from t3;
+select * from v1 where (select a,b from v3 where v3.c=v1.c) in (select x,y from v2 where v1.c= v2.z);
+prepare stmt from "select * from v1 where (select a,b from v3 where v3.c=v1.c) in (select x,y from v2 where v1.c= v2.z)";
+EXECUTE stmt;
+EXECUTE stmt;
+set optimizer_switch=@optimizer_switch_save;
+set join_cache_level=@join_cache_level_save;
+
+deallocate prepare stmt;
+drop view v1,v2,v3;
+drop table t1,t2,t3;
+
--echo # End of 5.5 tests
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index a0bd7b4..eb9bea8 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -115,6 +115,11 @@ drop table t1;
insert into t1 values(1);
#
+# MDEV-14056 DROP TEMPORARY TABLE IF EXISTS causes error 1290 with read_only option
+#
+drop temporary table if exists t1;
+
+#
# Bug#11733 COMMITs should not happen if read-only is set
#
diff --git a/mysql-test/t/show_function_with_pad_char_to_full_length.test b/mysql-test/t/show_function_with_pad_char_to_full_length.test
new file mode 100644
index 0000000..f47f362
--- /dev/null
+++ b/mysql-test/t/show_function_with_pad_char_to_full_length.test
@@ -0,0 +1,23 @@
+#
+# Test that show function status succeeds with
+# sql_mode = 'PAD_CHAR_TO_FULL_LENGTH (MDEV-13149)
+
+# show function status
+
+create function f() returns int return 1;
+--replace_column 1 T 3 T 4 T 5 T 6 T 7 T 8 T 9 T 10 T 11 T
+show function status;
+set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH';
+--replace_column 1 T 3 T 4 T 5 T 6 T 7 T 8 T 9 T 10 T 11 T
+show function status;
+drop function f;
+select @@sql_mode;
+
+# select ROUTINE_NAME from information_schema.ROUTINES
+
+create function f() returns int return 1;
+select ROUTINE_NAME from information_schema.ROUTINES where ROUTINE_NAME='f';
+set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH';
+select ROUTINE_NAME from information_schema.ROUTINES where ROUTINE_NAME='f';
+drop function f;
+select @@sql_mode;
diff --git a/mysql-test/t/subselect_mat_cost_bugs.test b/mysql-test/t/subselect_mat_cost_bugs.test
index 35f2b95..67af6e3 100644
--- a/mysql-test/t/subselect_mat_cost_bugs.test
+++ b/mysql-test/t/subselect_mat_cost_bugs.test
@@ -522,4 +522,23 @@ select * from t1 where a in (select max(a) from t1 where a < 4) or a > 5;
drop table t1;
+--echo #
+--echo # MDEV-13135: subquery with ON expression subject to
+--echo # semi-join optimizations
+--echo #
+
+CREATE TABLE t1 (a INT);
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT a AS v_a FROM t1;
+INSERT INTO t1 VALUES (1),(3);
+
+CREATE TABLE t2 (b INT, KEY(b));
+INSERT INTO t2 VALUES (3),(4);
+
+SELECT * FROM t1 WHERE a NOT IN (
+ SELECT b FROM t2 INNER JOIN v1 ON (b IN ( SELECT a FROM t1 ))
+ WHERE v_a = b
+);
+
+DROP VIEW v1;
+DROP TABLE t1,t2;
diff --git a/mysql-test/t/type_varchar.test b/mysql-test/t/type_varchar.test
index 33b8426..ed82182 100644
--- a/mysql-test/t/type_varchar.test
+++ b/mysql-test/t/type_varchar.test
@@ -217,3 +217,47 @@ CREATE TABLE t1 (a CHAR(16));
INSERT INTO t1 VALUES ('5'), ('s'), ('');
SELECT 5 = a FROM t1;
DROP TABLE t1;
+
+--echo #
+--echo # MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535
+--echo #
+
+CREATE TABLE t1 (c1 VARBINARY(65532));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARBINARY(65533));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARBINARY(65534));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARBINARY(65535));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARBINARY(65536));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(65532));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(65533));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(65534));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(65535));
+DESCRIBE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (c1 VARCHAR(65536));
+DESCRIBE t1;
+DROP TABLE t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 659327e..79991f8 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -5573,11 +5573,8 @@ drop table t1,t2,t3;
CREATE TABLE t3 (a INT);
CREATE ALGORITHM = MERGE VIEW v1 AS SELECT t2.a FROM t3 AS t1, t3 AS t2;
CREATE ALGORITHM = MERGE VIEW v2 AS SELECT * FROM v1;
-PREPARE stmt FROM 'REPLACE INTO v2 SELECT a FROM t3';
---error ER_VIEW_NO_INSERT_FIELD_LIST
-EXECUTE stmt;
--error ER_VIEW_NO_INSERT_FIELD_LIST
-EXECUTE stmt;
+PREPARE stmt FROM 'REPLACE INTO v2 SELECT a FROM t3';
drop view v1,v2;
drop table t3;
diff --git a/mysys/my_new.cc b/mysys/my_new.cc
index 4266452..a401ccf 100644
--- a/mysys/my_new.cc
+++ b/mysys/my_new.cc
@@ -47,6 +47,11 @@ void* operator new[](std::size_t sz, const std::nothrow_t&) throw()
return (void *) my_malloc (sz ? sz : 1, MYF(0));
}
+void operator delete (void *ptr, std::size_t)
+{
+ my_free(ptr);
+}
+
void operator delete (void *ptr)
{
my_free(ptr);
@@ -57,6 +62,11 @@ void operator delete[] (void *ptr) throw ()
my_free(ptr);
}
+void operator delete[] (void *ptr, std::size_t) throw ()
+{
+ my_free(ptr);
+}
+
void operator delete(void* ptr, const std::nothrow_t&) throw()
{
my_free(ptr);
diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt
index 358139e..a0cac00 100644
--- a/plugin/handler_socket/CMakeLists.txt
+++ b/plugin/handler_socket/CMakeLists.txt
@@ -10,6 +10,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF()
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(" -Wdeprecated-declarations" HAVE_CXX_WDEPRECATED_DECLARATIONS)
+IF (HAVE_CXX_WDEPRECATED_DECLARATIONS)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ENDIF()
+
INCLUDE_DIRECTORIES(libhsclient)
# Handlersocket client library. We do not distribute it,
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index c9f4786..ad2a461 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -15,7 +15,7 @@
#define PLUGIN_VERSION 0x104
-#define PLUGIN_STR_VERSION "1.4.1"
+#define PLUGIN_STR_VERSION "1.4.2"
#define _my_thread_var loc_thread_var
@@ -1090,6 +1090,7 @@ static void setup_connection_connect(struct connection_info *cn,
const struct mysql_event_connection *event)
{
cn->query_id= 0;
+ cn->query_length= 0;
cn->log_always= 0;
cn->thread_id= event->thread_id;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
@@ -1131,6 +1132,7 @@ static void setup_connection_initdb(struct connection_info *cn,
cn->thread_id= event->general_thread_id;
cn->query_id= 0;
+ cn->query_length= 0;
cn->log_always= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
event->general_query, event->general_query_length);
@@ -1163,6 +1165,7 @@ static void setup_connection_table(struct connection_info *cn,
cn->thread_id= event->thread_id;
cn->query_id= query_counter++;
cn->log_always= 0;
+ cn->query_length= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
event->database, event->database_length);
get_str_n(cn->user, &cn->user_length, sizeof(cn->db),
@@ -1184,6 +1187,7 @@ static void setup_connection_query(struct connection_info *cn,
cn->thread_id= event->general_thread_id;
cn->query_id= query_counter++;
cn->log_always= 0;
+ cn->query_length= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db), "", 0);
if (get_user_host(event->general_user, event->general_user_length,
@@ -2008,6 +2012,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
event_query_command(event))
{
log_statement(cn, event, "QUERY");
+ cn->query_length= 0; /* So the log_current_query() won't log this again. */
}
}
else if (event_class == MYSQL_AUDIT_TABLE_CLASS && FILTER(EVENT_TABLE) && cn)
@@ -2523,7 +2528,8 @@ static void log_current_query(MYSQL_THD thd)
if (!thd)
return;
cn= get_loc_info(thd);
- if (!ci_needs_setup(cn) && FILTER(EVENT_QUERY) && do_log_user(cn->user))
+ if (!ci_needs_setup(cn) && cn->query_length &&
+ FILTER(EVENT_QUERY) && do_log_user(cn->user))
{
log_statement_ex(cn, cn->query_time, thd_get_thread_id(thd),
cn->query, cn->query_length, 0, "QUERY");
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index b4bd930..93ee3e9 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -205,6 +205,11 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR})
ENDIF()
+SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
+SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
+SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
+SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
+
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index aefcc1a..00cf77d 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -159,7 +159,7 @@ parse_arguments()
# Try to find a specific file within --basedir which can either be a binary
# release or installed source directory and return the path.
-find_in_basedir()
+find_in_dirs()
{
case "$1" in
--dir)
@@ -171,13 +171,13 @@ find_in_basedir()
for dir in "$@"
do
- if test -f "$basedir/$dir/$file"
+ if test -f "$dir/$file"
then
if test -n "$return_dir"
then
- echo "$basedir/$dir"
+ echo "$dir"
else
- echo "$basedir/$dir/$file"
+ echo "$dir/$file"
fi
break
fi
@@ -239,7 +239,7 @@ then
print_defaults="$builddir/extra/my_print_defaults"
elif test -n "$basedir"
then
- print_defaults=`find_in_basedir my_print_defaults bin extra`
+ print_defaults=`find_in_dirs my_print_defaults $basedir/bin $basedir/extra`
if test -z "$print_defaults"
then
cannot_find_file my_print_defaults $basedir/bin $basedir/extra
@@ -265,41 +265,43 @@ if test -n "$srcdir"
then
basedir="$builddir"
bindir="$basedir/client"
- extra_bindir="$basedir/extra"
+ resolveip="$basedir/extra/resolveip"
mysqld="$basedir/sql/mysqld"
langdir="$basedir/sql/share/english"
pkgdatadir="$srcdir/scripts"
- scriptdir="$srcdir/scripts"
elif test -n "$basedir"
then
- bindir="$basedir/bin"
- extra_bindir="$bindir"
- mysqld=`find_in_basedir mysqld libexec sbin bin`
+ bindir="$basedir/bin" # only used in the help text
+ resolveip=`find_in_dirs resolveip @resolveip_locations@`
+ if test -z "$resolveip"
+ then
+ cannot_find_file resolveip @resolveip_locations@
+ exit 1
+ fi
+ mysqld=`find_in_dirs mysqld @mysqld_locations@`
if test -z "$mysqld"
then
- cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
+ cannot_find_file mysqld @mysqld_locations@
exit 1
fi
- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
+ langdir=`find_in_dirs --dir errmsg.sys @errmsg_locations@`
if test -z "$langdir"
then
- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
+ cannot_find_file errmsg.sys @errmsg_locations@
exit 1
fi
- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
+ pkgdatadir=`find_in_dirs --dir fill_help_tables.sql @pkgdata_locations@`
if test -z "$pkgdatadir"
then
- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
+ cannot_find_file fill_help_tables.sql @pkgdata_locations@
exit 1
fi
- scriptdir="$basedir/scripts"
else
basedir="@prefix@"
bindir="@bindir@"
- extra_bindir="$bindir"
+ resolveip="$bindir/resolveip"
mysqld="@libexecdir@/mysqld"
pkgdatadir="@pkgdatadir@"
- scriptdir="@scriptdir@"
fi
# Set up paths to SQL scripts required for bootstrap
@@ -342,14 +344,14 @@ hostname=`@HOSTNAME@`
# Check if hostname is valid
if test "$cross_bootstrap" -eq 0 -a "$in_rpm" -eq 0 -a "$force" -eq 0
then
- resolved=`"$extra_bindir/resolveip" $hostname 2>&1`
+ resolved=`"$resolveip" $hostname 2>&1`
if test $? -ne 0
then
- resolved=`"$extra_bindir/resolveip" localhost 2>&1`
+ resolved=`"$resolveip" localhost 2>&1`
if test $? -ne 0
then
echo "Neither host '$hostname' nor 'localhost' could be looked up with"
- echo "'$extra_bindir/resolveip'"
+ echo "'$resolveip'"
echo "Please configure the 'hostname' command to return a correct"
echo "hostname."
echo "If you want to solve this at a later stage, restart this script"
@@ -357,7 +359,7 @@ then
link_to_help
exit 1
fi
- echo "WARNING: The host '$hostname' could not be looked up with resolveip."
+ echo "WARNING: The host '$hostname' could not be looked up with $resolveip."
echo "This probably means that your libc libraries are not 100 % compatible"
echo "with this binary MariaDB version. The MariaDB daemon, mysqld, should work"
echo "normally with the exception that host name resolving will not work."
@@ -436,7 +438,7 @@ else
echo "The problem could be conflicting information in an external"
echo "my.cnf files. You can ignore these by doing:"
echo
- echo " shell> $scriptdir/scripts/mysql_install_db --defaults-file=~/.my.cnf"
+ echo " shell> $0 --defaults-file=~/.my.cnf"
echo
echo "You can also try to start the mysqld daemon with:"
echo
diff --git a/sql-common/client.c b/sql-common/client.c
index e0412fc..7d92f71 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1276,6 +1276,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
break;
case OPT_pipe:
options->protocol = MYSQL_PROTOCOL_PIPE;
+ break;
case OPT_connect_timeout:
case OPT_timeout:
if (opt_arg)
diff --git a/sql/events.cc b/sql/events.cc
index 763c75e..008b622 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -185,8 +185,8 @@ common_1_lev_code:
expr= tmp_expr - (tmp_expr/60)*60;
/* the code after the switch will finish */
- }
break;
+ }
case INTERVAL_HOUR_SECOND:
{
ulonglong tmp_expr= expr;
@@ -202,8 +202,8 @@ common_1_lev_code:
expr= tmp_expr - (tmp_expr/60)*60;
/* the code after the switch will finish */
- }
break;
+ }
case INTERVAL_DAY_SECOND:
{
ulonglong tmp_expr= expr;
@@ -225,8 +225,8 @@ common_1_lev_code:
expr= tmp_expr - (tmp_expr/60)*60;
/* the code after the switch will finish */
- }
break;
+ }
case INTERVAL_DAY_MICROSECOND:
case INTERVAL_HOUR_MICROSECOND:
case INTERVAL_MINUTE_MICROSECOND:
@@ -240,6 +240,8 @@ common_1_lev_code:
break;
case INTERVAL_WEEK:
expr/= 7;
+ close_quote= FALSE;
+ break;
default:
close_quote= FALSE;
break;
diff --git a/sql/field.cc b/sql/field.cc
index 716d522..08ba437 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2008, 2013, Monty Program Ab
+ Copyright (c) 2000, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2008, 2017, MariaDB
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
@@ -7947,13 +7947,13 @@ String *Field_set::val_str(String *val_buffer,
ulonglong tmp=(ulonglong) Field_enum::val_int();
uint bitnr=0;
+ /*
+ Some callers expect *val_buffer to contain the result,
+ so we assign to it, rather than doing 'return &empty_set_string.
+ */
+ *val_buffer= empty_set_string;
if (tmp == 0)
{
- /*
- Some callers expect *val_buffer to contain the result,
- so we assign to it, rather than doing 'return &empty_set_string.
- */
- *val_buffer= empty_set_string;
return val_buffer;
}
@@ -9218,7 +9218,7 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type,
case MYSQL_TYPE_DATE:
/* We don't support creation of MYSQL_TYPE_DATE anymore */
sql_type= MYSQL_TYPE_NEWDATE;
- /* fall trough */
+ /* fall through */
case MYSQL_TYPE_NEWDATE:
length= MAX_DATE_WIDTH;
break;
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index e048dba..bc2f597 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2005, 2013, Oracle and/or its affiliates.
+ Copyright (c) 2005, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2017, MariaDB
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
@@ -1747,7 +1748,7 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
cleanup_new_partition(part_count);
DBUG_RETURN(error);
}
-
+
DBUG_PRINT("info", ("Add partition %s", part_name_buff));
if ((error= prepare_new_partition(table, create_info,
new_file_array[i],
@@ -7331,6 +7332,7 @@ void ha_partition::print_error(int error, myf errflag)
m_err_rec= NULL;
DBUG_VOID_RETURN;
}
+ /* fall through */
default:
{
if (!(thd->lex->alter_info.flags & ALTER_TRUNCATE_PARTITION))
diff --git a/sql/item.cc b/sql/item.cc
index fdfbba3..fa2e52b 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -6004,7 +6004,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length)
collation.collation);
break;
}
- /* Fall through to make_string_field() */
+ /* fall through */
case MYSQL_TYPE_ENUM:
case MYSQL_TYPE_SET:
case MYSQL_TYPE_VAR_STRING:
@@ -6726,6 +6726,7 @@ bool Item::cache_const_expr_analyzer(uchar **arg)
*/
if (const_item() &&
!(basic_const_item() || item->basic_const_item() ||
+ item->type() == Item::NULL_ITEM || /* Item_name_const hack */
item->type() == Item::FIELD_ITEM ||
item->type() == SUBSELECT_ITEM ||
/*
@@ -6876,7 +6877,11 @@ public:
// Find which select the field is in. This is achieved by walking up
// the select tree and looking for the table of interest.
st_select_lex *sel;
- for (sel= current_select; sel; sel= sel->outer_select())
+ for (sel= current_select;
+ sel ;
+ sel= (sel->context.outer_context ?
+ sel->context.outer_context->select_lex:
+ NULL))
{
List_iterator<TABLE_LIST> li(sel->leaf_tables);
TABLE_LIST *tbl;
@@ -8071,7 +8076,6 @@ bool Item_direct_view_ref::send(Protocol *protocol, String *buffer)
bool Item_direct_view_ref::fix_fields(THD *thd, Item **reference)
{
- DBUG_ASSERT(1);
/* view fild reference must be defined */
DBUG_ASSERT(*ref);
/* (*ref)->check_cols() will be made in Item_direct_ref::fix_fields */
@@ -9955,7 +9959,7 @@ void Item_direct_view_ref::update_used_tables()
table_map Item_direct_view_ref::used_tables() const
{
- DBUG_ASSERT(null_ref_table);
+ DBUG_ASSERT(fixed);
if (get_depended_from())
return OUTER_REF_TABLE_BIT;
diff --git a/sql/item.h b/sql/item.h
index 9db5c7e..4d0860a 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1,8 +1,8 @@
#ifndef SQL_ITEM_INCLUDED
#define SQL_ITEM_INCLUDED
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
- Copyright (c) 2009, 2016, MariaDB
+/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2017, MariaDB
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
diff --git a/sql/item_func.cc b/sql/item_func.cc
index cfccd66..00006a2 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -863,6 +863,7 @@ void Item_func_num1::fix_length_and_dec()
break;
case TIME_RESULT:
cached_result_type= DECIMAL_RESULT;
+ /* fall through */
case DECIMAL_RESULT:
decimals= args[0]->decimal_scale(); // Do not preserve NOT_FIXED_DEC
max_length= args[0]->max_length;
@@ -2038,6 +2039,7 @@ my_decimal *Item_func_mod::decimal_op(my_decimal *decimal_value)
return decimal_value;
case E_DEC_DIV_ZERO:
signal_divide_by_null();
+ /* fall through */
default:
null_value= 1;
return 0;
diff --git a/sql/item_row.cc b/sql/item_row.cc
index ee1d172..9e81c05 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -44,7 +44,14 @@ Item_row::Item_row(List<Item> &arg):
//TODO: think placing 2-3 component items in item (as it done for function)
if ((arg_count= arg.elements))
+ {
items= (Item**) sql_alloc(sizeof(Item*)*arg_count);
+ if (!items)
+ {
+ arg_count= 0;
+ return;
+ }
+ }
else
items= 0;
List_iterator<Item> li(arg);
@@ -53,7 +60,28 @@ Item_row::Item_row(List<Item> &arg):
while ((item= li++))
{
items[i]= item;
- i++;
+ i++;
+ }
+}
+
+
+Item_row::Item_row(Item *item):
+ Item(),
+ used_tables_cache(0),
+ not_null_tables_cache(0),
+ arg_count(item->cols()),
+ const_item_cache(1),
+ with_null(0)
+{
+ items= (Item**) sql_alloc(sizeof(Item*) * arg_count);
+ if (!items)
+ {
+ arg_count= 0;
+ return;
+ }
+ for (uint i= 0; i < arg_count; i++)
+ {
+ items[i]= item->element_index(i);
}
}
diff --git a/sql/item_row.h b/sql/item_row.h
index aa56068..4d5c207 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -35,6 +35,7 @@ public:
const_item_cache(item->const_item_cache),
with_null(0)
{}
+ Item_row(Item *item);
enum Type type() const { return ROW_ITEM; };
void illegal_method_call(const char *);
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 756ab51..939e518 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -4430,7 +4430,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
goto null;
case DYN_COL_INT:
signed_value= 1; // For error message
- /* fall_trough */
+ /* fall through */
case DYN_COL_UINT:
if (signed_value || val.x.ulong_value <= LONGLONG_MAX)
{
@@ -4443,7 +4443,7 @@ bool Item_dyncol_get::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
}
/* let double_to_datetime_with_warn() issue the warning message */
val.x.double_value= static_cast<double>(ULONGLONG_MAX);
- /* fall_trough */
+ /* fall through */
case DYN_COL_DOUBLE:
if (double_to_datetime_with_warn(val.x.double_value, ltime, fuzzy_date,
0 /* TODO */))
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index ef90dd5..90f2bd5 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1374,6 +1374,9 @@ Item_in_subselect::Item_in_subselect(Item * left_exp,
{
DBUG_ENTER("Item_in_subselect::Item_in_subselect");
left_expr_orig= left_expr= left_exp;
+ /* prepare to possible disassembling the item in convert_subq_to_sj() */
+ if (left_exp->type() == Item::ROW_ITEM)
+ left_expr_orig= new Item_row(left_exp);
func= &eq_creator;
init(select_lex, new select_exists_subselect(this));
max_columns= UINT_MAX;
@@ -1398,6 +1401,9 @@ Item_allany_subselect::Item_allany_subselect(Item * left_exp,
{
DBUG_ENTER("Item_allany_subselect::Item_allany_subselect");
left_expr_orig= left_expr= left_exp;
+ /* prepare to possible disassembling the item in convert_subq_to_sj() */
+ if (left_exp->type() == Item::ROW_ITEM)
+ left_expr_orig= new Item_row(left_exp);
func= func_creator(all_arg);
init(select_lex, new select_exists_subselect(this));
max_columns= 1;
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 0ed1506..eeb373a 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -1733,9 +1733,18 @@ overflow:
ltime->hour= TIME_MAX_HOUR+1;
check_time_range(ltime, decimals, &unused);
- make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
- err->ptr(), err->length(),
- MYSQL_TIMESTAMP_TIME, NullS);
+ if (!err)
+ {
+ ErrConvInteger err2(sec, unsigned_flag);
+ make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+ &err2, MYSQL_TIMESTAMP_TIME, NullS);
+ }
+ else
+ {
+ ErrConvString err2(err);
+ make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+ &err2, MYSQL_TIMESTAMP_TIME, NullS);
+ }
return 0;
}
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 0062d50..5be9c5c 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -500,8 +500,16 @@ public:
{ return val_decimal_from_date(decimal_value); }
Field *tmp_table_field(TABLE *table)
{ return tmp_table_field_from_field_type(table, 0); }
+#if MARIADB_VERSION_ID > 100300
+#error This code should be removed in 10.3, to use the derived save_in_field()
+#else
int save_in_field(Field *field, bool no_conversions)
- { return save_date_in_field(field); }
+ {
+ return field_type() == MYSQL_TYPE_TIME ?
+ save_time_in_field(field) :
+ save_date_in_field(field);
+ }
+#endif
void fix_length_and_dec();
};
diff --git a/sql/log.cc b/sql/log.cc
index f8c256e..5b4ba87 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -7261,8 +7261,10 @@ void TC_LOG_MMAP::close()
mysql_cond_destroy(&COND_pool);
mysql_cond_destroy(&COND_active);
mysql_cond_destroy(&COND_queue_busy);
+ /* fall through */
case 5:
data[0]='A'; // garble the first (signature) byte, in case mysql_file_delete fails
+ /* fall through */
case 4:
for (i=0; i < npages; i++)
{
@@ -7271,10 +7273,13 @@ void TC_LOG_MMAP::close()
mysql_mutex_destroy(&pages[i].lock);
mysql_cond_destroy(&pages[i].cond);
}
+ /* fall through */
case 3:
my_free(pages);
+ /* fall through */
case 2:
my_munmap((char*)data, (size_t)file_length);
+ /* fall through */
case 1:
mysql_file_close(fd, MYF(0));
}
diff --git a/sql/log_event.cc b/sql/log_event.cc
index d5b5b5a..18e4cfb 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -6437,21 +6437,6 @@ User_var_log_event(const char* buf, uint event_len,
we keep the flags set to UNDEF_F.
*/
uint bytes_read= ((val + val_len) - start);
-#ifndef DBUG_OFF
- bool old_pre_checksum_fd= description_event->is_version_before_checksum(
- &description_event->server_version_split);
-#endif
- DBUG_ASSERT((bytes_read == data_written -
- (old_pre_checksum_fd ||
- (description_event->checksum_alg ==
- BINLOG_CHECKSUM_ALG_OFF)) ?
- 0 : BINLOG_CHECKSUM_LEN)
- ||
- (bytes_read == data_written -1 -
- (old_pre_checksum_fd ||
- (description_event->checksum_alg ==
- BINLOG_CHECKSUM_ALG_OFF)) ?
- 0 : BINLOG_CHECKSUM_LEN));
if ((data_written - bytes_read) > 0)
{
flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index af1abb2..69a5367 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -1609,6 +1609,7 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred)
sj-nest.
*/
st_select_lex *subq_lex= subq_pred->unit->first_select();
+ DBUG_ASSERT(subq_lex->next_select() == NULL);
nested_join->join_list.empty();
List_iterator_fast<TABLE_LIST> li(subq_lex->top_join_list);
TABLE_LIST *tl;
@@ -1706,7 +1707,8 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred)
if (subq_pred->left_expr->cols() == 1)
{
- nested_join->sj_outer_expr_list.push_back(subq_pred->left_expr);
+ /* add left = select_list_element */
+ nested_join->sj_outer_expr_list.push_back(&subq_pred->left_expr);
/*
Create Item_func_eq. Note that
1. this is done on the statement, not execution, arena
@@ -1718,24 +1720,61 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred)
*/
Item_func_eq *item_eq=
new Item_func_eq(subq_pred->left_expr_orig, subq_lex->ref_pointer_array[0]);
+ if (!item_eq)
+ DBUG_RETURN(TRUE);
if (subq_pred->left_expr_orig != subq_pred->left_expr)
thd->change_item_tree(item_eq->arguments(), subq_pred->left_expr);
item_eq->in_equality_no= 0;
sj_nest->sj_on_expr= and_items(sj_nest->sj_on_expr, item_eq);
}
- else
+ else if (subq_pred->left_expr->type() == Item::ROW_ITEM)
{
+ /*
+ disassemple left expression and add
+ left1 = select_list_element1 and left2 = select_list_element2 ...
+ */
for (uint i= 0; i < subq_pred->left_expr->cols(); i++)
{
nested_join->sj_outer_expr_list.push_back(subq_pred->left_expr->
- element_index(i));
- Item_func_eq *item_eq=
- new Item_func_eq(subq_pred->left_expr->element_index(i),
+ addr(i));
+ Item_func_eq *item_eq=
+ new Item_func_eq(subq_pred->left_expr_orig->element_index(i),
subq_lex->ref_pointer_array[i]);
+ if (!item_eq)
+ DBUG_RETURN(TRUE);
+ DBUG_ASSERT(subq_pred->left_expr->element_index(i)->fixed);
+ if (subq_pred->left_expr_orig->element_index(i) !=
+ subq_pred->left_expr->element_index(i))
+ thd->change_item_tree(item_eq->arguments(),
+ subq_pred->left_expr->element_index(i));
item_eq->in_equality_no= i;
sj_nest->sj_on_expr= and_items(sj_nest->sj_on_expr, item_eq);
}
}
+ else
+ {
+ /*
+ add row operation
+ left = (select_list_element1, select_list_element2, ...)
+ */
+ Item_row *row= new Item_row(subq_lex->pre_fix);
+ /* fix fields on subquery was call so they should be the same */
+ DBUG_ASSERT(subq_pred->left_expr->cols() == row->cols());
+ if (!row)
+ DBUG_RETURN(TRUE);
+ nested_join->sj_outer_expr_list.push_back(&subq_pred->left_expr);
+ Item_func_eq *item_eq=
+ new Item_func_eq(subq_pred->left_expr_orig, row);
+ if (!item_eq)
+ DBUG_RETURN(TRUE);
+ for (uint i= 0; i < row->cols(); i++)
+ {
+ if (row->element_index(i) != subq_lex->ref_pointer_array[i])
+ thd->change_item_tree(row->addr(i), subq_lex->ref_pointer_array[i]);
+ }
+ item_eq->in_equality_no= 0;
+ sj_nest->sj_on_expr= and_items(sj_nest->sj_on_expr, item_eq);
+ }
/*
Fix the created equality and AND
@@ -3285,8 +3324,8 @@ void restore_prev_sj_state(const table_map remaining_tables,
ulonglong get_bound_sj_equalities(TABLE_LIST *sj_nest,
table_map remaining_tables)
{
- List_iterator<Item> li(sj_nest->nested_join->sj_outer_expr_list);
- Item *item;
+ List_iterator<Item_ptr> li(sj_nest->nested_join->sj_outer_expr_list);
+ Item **item;
uint i= 0;
ulonglong res= 0;
while ((item= li++))
@@ -3297,7 +3336,7 @@ ulonglong get_bound_sj_equalities(TABLE_LIST *sj_nest,
class and see if there is an element that is bound?
(this is an optional feature)
*/
- if (!(item->used_tables() & remaining_tables))
+ if (!(item[0]->used_tables() & remaining_tables))
{
res |= 1ULL << i;
}
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 1a8c6be..f717be5 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -1047,6 +1047,7 @@ static int maxmin_in_range(bool max_fl, Field* field, COND *cond)
case Item_func::LT_FUNC:
case Item_func::LE_FUNC:
less_fl= 1;
+ /* fall through */
case Item_func::GT_FUNC:
case Item_func::GE_FUNC:
{
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index d8b9017..512bf29 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -34,8 +34,6 @@
partition_info *partition_info::get_clone()
{
- if (!this)
- return 0;
List_iterator<partition_element> part_it(partitions);
partition_element *part;
partition_info *clone= new partition_info();
diff --git a/sql/slave.cc b/sql/slave.cc
index 3a03464..dc499fb 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2341,7 +2341,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
thd->enable_slow_log= opt_log_slow_slave_statements;
thd->variables.log_slow_filter= global_system_variables.log_slow_filter;
set_slave_thread_options(thd);
- thd->client_capabilities = CLIENT_LOCAL_FILES;
mysql_mutex_lock(&LOCK_thread_count);
thd->thread_id= thd->variables.pseudo_thread_id= thread_id++;
mysql_mutex_unlock(&LOCK_thread_count);
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 69364ea..14a5791 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -139,7 +139,7 @@ sp_get_item_value(THD *thd, Item *item, String *str)
case DECIMAL_RESULT:
if (item->field_type() != MYSQL_TYPE_BIT)
return item->val_str(str);
- else {/* Bit type is handled as binary string */}
+ /* fall through */
case STRING_RESULT:
{
String *result= item->val_str(str);
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 55effcd..7cddf50 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -54,7 +54,6 @@ static bool admin_recreate_table(THD *thd, TABLE_LIST *table_list)
if (thd->stmt_da->is_ok())
thd->stmt_da->reset_diagnostics_area();
table_list->table= NULL;
- result_code= result_code ? HA_ADMIN_FAILED : HA_ADMIN_OK;
DBUG_RETURN(result_code);
}
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7f84f35..c06c4fc 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8128,13 +8128,15 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
bool setup_fields(THD *thd, Item **ref_pointer_array,
List<Item> &fields, enum_mark_columns mark_used_columns,
- List<Item> *sum_func_list, bool allow_sum_func)
+ List<Item> *sum_func_list, List<Item> *pre_fix,
+ bool allow_sum_func)
{
reg2 Item *item;
enum_mark_columns save_mark_used_columns= thd->mark_used_columns;
nesting_map save_allow_sum_func= thd->lex->allow_sum_func;
List_iterator<Item> it(fields);
bool save_is_item_list_lookup;
+ bool make_pre_fix= (pre_fix && (pre_fix->elements == 0));
DBUG_ENTER("setup_fields");
DBUG_PRINT("enter", ("ref_pointer_array: %p", ref_pointer_array));
@@ -8181,6 +8183,9 @@ bool setup_fields(THD *thd, Item **ref_pointer_array,
thd->lex->current_select->cur_pos_in_select_list= 0;
while ((item= it++))
{
+ if (make_pre_fix)
+ pre_fix->push_back(item, thd->stmt_arena->mem_root);
+
if ((!item->fixed && item->fix_fields(thd, it.ref())) ||
(item= *(it.ref()))->check_cols(1))
{
diff --git a/sql/sql_base.h b/sql/sql_base.h
index d49554d..0cde933 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -216,7 +216,8 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
List<Item> *sum_func_list, uint wild_num);
bool setup_fields(THD *thd, Item** ref_pointer_array,
List<Item> &item, enum_mark_columns mark_used_columns,
- List<Item> *sum_func_list, bool allow_sum_func);
+ List<Item> *sum_func_list, List<Item> *pre_fix,
+ bool allow_sum_func);
void unfix_fields(List<Item> &items);
bool fill_record(THD *thd, Field **field, List<Item> &values,
bool ignore_errors, bool use_value);
@@ -407,7 +408,7 @@ inline bool setup_fields_with_no_wrap(THD *thd, Item **ref_pointer_array,
bool res;
thd->lex->select_lex.no_wrap_view_item= TRUE;
res= setup_fields(thd, ref_pointer_array, item, mark_used_columns,
- sum_func_list, allow_sum_func);
+ sum_func_list, NULL, allow_sum_func);
thd->lex->select_lex.no_wrap_view_item= FALSE;
return res;
}
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 5dd7cd1..f4be996 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3919,7 +3919,7 @@ public:
{
DBUG_ENTER("unique_add");
DBUG_PRINT("info", ("tree %u - %lu", tree.elements_in_tree, max_elements));
- if (!(tree.flag & TREE_ONLY_DUPS) &&
+ if (!(tree.flag & TREE_ONLY_DUPS) &&
tree.elements_in_tree >= max_elements && flush())
DBUG_RETURN(1);
DBUG_RETURN(!tree_insert(&tree, ptr, 0, tree.custom_arg));
diff --git a/sql/sql_const.h b/sql/sql_const.h
index abe2a49..e8385b5 100644
--- a/sql/sql_const.h
+++ b/sql/sql_const.h
@@ -41,7 +41,18 @@
#define MAX_MBWIDTH 3 /* Max multibyte sequence */
#define MAX_FIELD_CHARLENGTH 255
-#define MAX_FIELD_VARCHARLENGTH 65535
+/*
+ In MAX_FIELD_VARCHARLENGTH we reserve extra bytes for the overhead:
+ - 2 bytes for the length
+ - 1 byte for NULL bits
+ to avoid the "Row size too large" error for these three corner definitions:
+ CREATE TABLE t1 (c VARBINARY(65533));
+ CREATE TABLE t1 (c VARBINARY(65534));
+ CREATE TABLE t1 (c VARBINARY(65535));
+ Like VARCHAR(65536), they will be converted to BLOB automatically
+ in non-sctict mode.
+*/
+#define MAX_FIELD_VARCHARLENGTH (65535-2-1)
#define MAX_FIELD_BLOBLENGTH UINT_MAX32 /* cf field_blob::get_length() */
#define CONVERT_IF_BIGGER_TO_BLOB 512 /* Threshold *in characters* */
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 493f0ec..6cd4547 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -510,6 +510,8 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
DBUG_ENTER("mysql_derived_merge_for_insert");
if (derived->merged_for_insert)
DBUG_RETURN(FALSE);
+ if (derived->init_derived(thd, FALSE))
+ DBUG_RETURN(TRUE);
if (derived->is_materialized_derived())
DBUG_RETURN(mysql_derived_prepare(thd, lex, derived));
if ((thd->lex->sql_command == SQLCOM_UPDATE_MULTI ||
@@ -526,8 +528,6 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->merged_for_insert= TRUE;
}
}
- else
- derived->table= derived->merge_underlying_list->table;
DBUG_RETURN(FALSE);
}
diff --git a/sql/sql_do.cc b/sql/sql_do.cc
index 4ba887b..46bdb42 100644
--- a/sql/sql_do.cc
+++ b/sql/sql_do.cc
@@ -28,7 +28,7 @@ bool mysql_do(THD *thd, List<Item> &values)
List_iterator<Item> li(values);
Item *value;
DBUG_ENTER("mysql_do");
- if (setup_fields(thd, 0, values, MARK_COLUMNS_NONE, 0, 0))
+ if (setup_fields(thd, 0, values, MARK_COLUMNS_NONE, 0, NULL, 0))
DBUG_RETURN(TRUE);
while ((value = li++))
value->val_int();
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 70a12fa..267a9a6 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -262,7 +262,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
if (table_list->is_view())
unfix_fields(fields);
- res= setup_fields(thd, 0, fields, MARK_COLUMNS_WRITE, 0, 0);
+ res= setup_fields(thd, 0, fields, MARK_COLUMNS_WRITE, 0, NULL, 0);
/* Restore the current context. */
ctx_state.restore_state(context, table_list);
@@ -373,7 +373,7 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
}
/* Check the fields we are going to modify */
- if (setup_fields(thd, 0, update_fields, MARK_COLUMNS_WRITE, 0, 0))
+ if (setup_fields(thd, 0, update_fields, MARK_COLUMNS_WRITE, 0, NULL, 0))
return -1;
if (insert_table_list->is_view() &&
@@ -810,7 +810,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
my_error(ER_WRONG_VALUE_COUNT_ON_ROW, MYF(0), counter);
goto abort;
}
- if (setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, 0))
+ if (setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, NULL, 0))
goto abort;
}
its.rewind ();
@@ -1452,7 +1452,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
table_list->next_local= 0;
context->resolve_in_table_list_only(table_list);
- res= (setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, 0) ||
+ res= (setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, NULL, 0) ||
check_insert_fields(thd, context->table_list, fields, *values,
!insert_into_view, 0, &map));
@@ -1468,7 +1468,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
}
if (!res)
- res= setup_fields(thd, 0, update_values, MARK_COLUMNS_READ, 0, 0);
+ res= setup_fields(thd, 0, update_values, MARK_COLUMNS_READ, 0, NULL, 0);
if (!res && duplic == DUP_UPDATE)
{
@@ -3369,7 +3369,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
*/
lex->current_select= &lex->select_lex;
- res= (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, 0) ||
+ res= (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, NULL, 0) ||
check_insert_fields(thd, table_list, *fields, values,
!insert_into_view, 1, &map));
@@ -3425,7 +3425,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
ctx_state.get_first_name_resolution_table();
res= res || setup_fields(thd, 0, *info.update_values,
- MARK_COLUMNS_READ, 0, 0);
+ MARK_COLUMNS_READ, 0, NULL, 0);
if (!res)
{
/*
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 6611fd4..6f94f1f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1147,12 +1147,14 @@ static int lex_one_token(YYSTYPE *yylval, THD *thd)
state= MY_LEX_HEX_NUMBER;
break;
}
+ /* fall through */
case MY_LEX_IDENT_OR_BIN:
if (lip->yyPeek() == '\'')
{ // Found b'bin-number'
state= MY_LEX_BIN_NUMBER;
break;
}
+ /* fall through */
case MY_LEX_IDENT:
const char *start;
#if defined(USE_MB) && defined(USE_MB_IDENT)
@@ -1499,7 +1501,7 @@ static int lex_one_token(YYSTYPE *yylval, THD *thd)
state= MY_LEX_USER_VARIABLE_DELIMITER;
break;
}
- /* " used for strings */
+ /* fall through */ /* " used for strings */
case MY_LEX_STRING: // Incomplete text string
if (!(yylval->lex_str.str = get_text(lip, 1, 1)))
{
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index d283085..3dcf876 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -758,6 +758,7 @@ public:
Group_list_ptrs *group_list_ptrs;
List<Item> item_list; /* list of fields & expressions */
+ List<Item> pre_fix; /* above list before fix_fields */
List<String> interval_list;
bool is_item_list_lookup;
/*
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 23865ab..5029efa 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -293,15 +293,15 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
Let us also prepare SET clause, altough it is probably empty
in this case.
*/
- if (setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) ||
- setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0))
+ if (setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) ||
+ setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, NULL, 0))
DBUG_RETURN(TRUE);
}
else
{ // Part field list
/* TODO: use this conds for 'WITH CHECK OPTIONS' */
- if (setup_fields(thd, 0, fields_vars, MARK_COLUMNS_WRITE, 0, 0) ||
- setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, 0) ||
+ if (setup_fields(thd, 0, fields_vars, MARK_COLUMNS_WRITE, 0, NULL, 0) ||
+ setup_fields(thd, 0, set_fields, MARK_COLUMNS_WRITE, 0, NULL, 0) ||
check_that_all_fields_are_given_values(thd, table, table_list))
DBUG_RETURN(TRUE);
/*
@@ -320,7 +320,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
}
}
/* Fix the expressions in SET clause */
- if (setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, 0))
+ if (setup_fields(thd, 0, set_values, MARK_COLUMNS_READ, 0, NULL, 0))
DBUG_RETURN(TRUE);
}
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ba0520d..9f8a625 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -811,8 +811,7 @@ out:
@retval FALSE The statement isn't updating any relevant tables.
*/
-static my_bool deny_updates_if_read_only_option(THD *thd,
- TABLE_LIST *all_tables)
+static bool deny_updates_if_read_only_option(THD *thd, TABLE_LIST *all_tables)
{
DBUG_ENTER("deny_updates_if_read_only_option");
@@ -821,11 +820,7 @@ static my_bool deny_updates_if_read_only_option(THD *thd,
LEX *lex= thd->lex;
- const my_bool user_is_super=
- ((ulong)(thd->security_ctx->master_access & SUPER_ACL) ==
- (ulong)SUPER_ACL);
-
- if (user_is_super)
+ if (thd->security_ctx->master_access & SUPER_ACL)
DBUG_RETURN(FALSE);
if (!(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA))
@@ -835,30 +830,26 @@ static my_bool deny_updates_if_read_only_option(THD *thd,
if (lex->sql_command == SQLCOM_UPDATE_MULTI)
DBUG_RETURN(FALSE);
+ if (lex->sql_command == SQLCOM_CREATE_DB ||
+ lex->sql_command == SQLCOM_DROP_DB)
+ DBUG_RETURN(TRUE);
+
/*
a table-to-be-created is not in the temp table list yet,
so CREATE TABLE needs a special treatment
*/
- const bool update_real_tables=
- lex->sql_command == SQLCOM_CREATE_TABLE
- ? !(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)
- : some_non_temp_table_to_be_updated(thd, all_tables);
-
- const bool create_or_drop_databases=
- (lex->sql_command == SQLCOM_CREATE_DB) ||
- (lex->sql_command == SQLCOM_DROP_DB);
-
- if (update_real_tables || create_or_drop_databases)
- {
- /*
- An attempt was made to modify one or more non-temporary tables.
- */
- DBUG_RETURN(TRUE);
- }
+ if (lex->sql_command == SQLCOM_CREATE_TABLE)
+ DBUG_RETURN(!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE));
+ /*
+ a table-to-be-dropped might not exist (DROP TEMPORARY TABLE IF EXISTS),
+ cannot use the temp table list either.
+ */
+ if (lex->sql_command == SQLCOM_DROP_TABLE && lex->drop_temporary)
+ DBUG_RETURN(FALSE);
- /* Assuming that only temporary tables are modified. */
- DBUG_RETURN(FALSE);
+ /* Now, check thd->temporary_tables list */
+ DBUG_RETURN(some_non_temp_table_to_be_updated(thd, all_tables));
}
/**
@@ -2481,7 +2472,7 @@ case SQLCOM_PREPARE:
#ifdef WITH_PARTITION_STORAGE_ENGINE
{
partition_info *part_info= thd->lex->part_info;
- if (part_info && !(part_info= thd->lex->part_info->get_clone()))
+ if (part_info && !(part_info= part_info->get_clone()))
{
res= -1;
goto end_with_restore_list;
@@ -2850,8 +2841,8 @@ end_with_restore_list:
/* mysql_update return 2 if we need to switch to multi-update */
if (up_result != 2)
break;
- /* Fall through */
}
+ /* fall through */
case SQLCOM_UPDATE_MULTI:
{
DBUG_ASSERT(first_table == all_tables && first_table != 0);
@@ -2961,6 +2952,7 @@ end_with_restore_list:
DBUG_PRINT("debug", ("Just after generate_incident()"));
}
#endif
+ /* fall through */
case SQLCOM_INSERT:
{
DBUG_ASSERT(first_table == all_tables && first_table != 0);
@@ -3698,6 +3690,7 @@ end_with_restore_list:
initialize this variable because RESET shares the same code as FLUSH
*/
lex->no_write_to_binlog= 1;
+ /* fall through */
case SQLCOM_FLUSH:
{
int write_to_binlog;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 0d9f6e6..ab31a8c 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2005, 2014, Oracle and/or its affiliates.
- Copyright (c) 2009, 2014, SkySQL Ab.
+/* Copyright (c) 2005, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2017, SkySQL Ab.
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
@@ -4640,7 +4640,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
thd->work_part_info= thd->lex->part_info;
if (thd->work_part_info &&
- !(thd->work_part_info= thd->lex->part_info->get_clone()))
+ !(thd->work_part_info= thd->work_part_info->get_clone()))
DBUG_RETURN(TRUE);
/* ALTER_ADMIN_PARTITION is handled in mysql_admin_table */
@@ -6672,7 +6672,8 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
lpt->alter_info= alter_info;
lpt->create_info= create_info;
lpt->db_options= create_info->table_options;
- if (create_info->row_type == ROW_TYPE_DYNAMIC)
+ if (create_info->row_type != ROW_TYPE_FIXED &&
+ create_info->row_type != ROW_TYPE_DEFAULT)
lpt->db_options|= HA_OPTION_PACK_RECORD;
lpt->table= fast_alter_table;
lpt->old_table= table;
@@ -8163,6 +8164,7 @@ int create_partition_name(char *out, size_t outlen, const char *in1,
}
else
transl_part= in2;
+
if (name_variant == NORMAL_PART_NAME)
end= strxnmov(out, outlen-1, in1, "#P#", transl_part, NullS);
else if (name_variant == TEMP_PART_NAME)
@@ -8177,25 +8179,19 @@ int create_partition_name(char *out, size_t outlen, const char *in1,
return 0;
}
-
-/*
- Create subpartition name
-
- SYNOPSIS
- create_subpartition_name()
- out:out The buffer for the created partition name string
- must be *at least* of FN_REFLEN+1 bytes
- in1 First part
- in2 Second part
- in3 Third part
- name_variant Normal, temporary or renamed partition name
-
- RETURN VALUE
- 0 if ok, error if name too long
-
- DESCRIPTION
- This method is used to calculate the subpartition name, service routine to
- the del_ren_cre_table method.
+/**
+ Create subpartition name. This method is used to calculate the
+ subpartition name, service routine to the del_ren_cre_table method.
+ The output buffer size should be FN_REFLEN + 1(terminating '\0').
+
+ @param [out] out Created partition name string
+ @param in1 First part
+ @param in2 Second part
+ @param in3 Third part
+ @param name_variant Normal, temporary or renamed partition name
+
+ @retval true Error.
+ @retval false Success.
*/
int create_subpartition_name(char *out, size_t outlen,
@@ -8207,6 +8203,7 @@ int create_subpartition_name(char *out, size_t outlen,
tablename_to_filename(in2, transl_part_name, FN_REFLEN);
tablename_to_filename(in3, transl_subpart_name, FN_REFLEN);
+
if (name_variant == NORMAL_PART_NAME)
end= strxnmov(out, outlen-1, in1, "#P#", transl_part_name,
"#SP#", transl_subpart_name, NullS);
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index 8380062..ea3802b 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -1,7 +1,8 @@
#ifndef SQL_PARTITION_INCLUDED
#define SQL_PARTITION_INCLUDED
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
+/* Copyright (c) 2006, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2011, 2017, MariaDB
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
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 75aca02..d1e855e 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -194,7 +194,6 @@ static DYNAMIC_ARRAY plugin_array;
static HASH plugin_hash[MYSQL_MAX_PLUGIN_TYPE_NUM];
static MEM_ROOT plugin_mem_root;
static bool reap_needed= false;
-static int plugin_array_version=0;
static bool initialized= 0;
@@ -312,7 +311,6 @@ static void plugin_vars_free_values(sys_var *vars);
static void restore_pluginvar_names(sys_var *first);
static void plugin_opt_set_limits(struct my_option *,
const struct st_mysql_sys_var *);
-static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref plugin);
static void intern_plugin_unlock(LEX *lex, plugin_ref plugin);
static void reap_plugins(void);
@@ -924,14 +922,16 @@ SHOW_COMP_OPTION plugin_status(const char *name, size_t len, int type)
}
-static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc)
+static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc,
+ uint state_mask= PLUGIN_IS_READY |
+ PLUGIN_IS_UNINITIALIZED)
{
st_plugin_int *pi= plugin_ref_to_int(rc);
DBUG_ENTER("intern_plugin_lock");
mysql_mutex_assert_owner(&LOCK_plugin);
- if (pi->state & (PLUGIN_IS_READY | PLUGIN_IS_UNINITIALIZED))
+ if (pi->state & state_mask)
{
plugin_ref plugin;
#ifdef DBUG_OFF
@@ -1078,43 +1078,42 @@ static bool plugin_add(MEM_ROOT *tmp_root,
if (!name->str && plugin_find_internal(&tmp.name, MYSQL_ANY_PLUGIN))
continue; // already installed
- struct st_plugin_int *tmp_plugin_ptr;
- if (*(int*)plugin->info <
- min_plugin_info_interface_version[plugin->type] ||
- ((*(int*)plugin->info) >> 8) >
- (cur_plugin_info_interface_version[plugin->type] >> 8))
- {
- char buf[256];
- strxnmov(buf, sizeof(buf) - 1, "API version for ",
- plugin_type_names[plugin->type].str,
- " plugin ", tmp.name.str,
- " not supported by this version of the server", NullS);
- report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, ENOEXEC, buf);
- goto err;
- }
- if (plugin_maturity_map[plugin->maturity] < plugin_maturity)
- {
- char buf[256];
- strxnmov(buf, sizeof(buf) - 1, "Loading of ",
- plugin_maturity_names[plugin->maturity],
- " plugin ", tmp.name.str,
- " is prohibited by --plugin-maturity=",
- plugin_maturity_names[plugin_maturity],
- NullS);
- report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, EPERM, buf);
- goto err;
- }
- tmp.plugin= plugin;
- tmp.ref_count= 0;
- tmp.state= PLUGIN_IS_UNINITIALIZED;
- tmp.load_option= PLUGIN_ON;
+ struct st_plugin_int *tmp_plugin_ptr;
+ if (*(int*)plugin->info <
+ min_plugin_info_interface_version[plugin->type] ||
+ ((*(int*)plugin->info) >> 8) >
+ (cur_plugin_info_interface_version[plugin->type] >> 8))
+ {
+ char buf[256];
+ strxnmov(buf, sizeof(buf) - 1, "API version for ",
+ plugin_type_names[plugin->type].str,
+ " plugin ", tmp.name.str,
+ " not supported by this version of the server", NullS);
+ report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, ENOEXEC, buf);
+ goto err;
+ }
+ if (plugin_maturity_map[plugin->maturity] < plugin_maturity)
+ {
+ char buf[256];
+ strxnmov(buf, sizeof(buf) - 1, "Loading of ",
+ plugin_maturity_names[plugin->maturity],
+ " plugin ", tmp.name.str,
+ " is prohibited by --plugin-maturity=",
+ plugin_maturity_names[plugin_maturity],
+ NullS);
+ report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, EPERM, buf);
+ goto err;
+ }
+ tmp.plugin= plugin;
+ tmp.ref_count= 0;
+ tmp.state= PLUGIN_IS_UNINITIALIZED;
+ tmp.load_option= PLUGIN_ON;
- if (!(tmp_plugin_ptr= plugin_insert_or_reuse(&tmp)))
- goto err;
- plugin_array_version++;
- if (my_hash_insert(&plugin_hash[plugin->type], (uchar*)tmp_plugin_ptr))
- tmp_plugin_ptr->state= PLUGIN_IS_FREED;
- init_alloc_root(&tmp_plugin_ptr->mem_root, 4096, 4096);
+ if (!(tmp_plugin_ptr= plugin_insert_or_reuse(&tmp)))
+ goto err;
+ if (my_hash_insert(&plugin_hash[plugin->type], (uchar*)tmp_plugin_ptr))
+ tmp_plugin_ptr->state= PLUGIN_IS_FREED;
+ init_alloc_root(&tmp_plugin_ptr->mem_root, 4096, 4096);
if (name->str)
DBUG_RETURN(FALSE); // all done
@@ -1210,7 +1209,6 @@ static void plugin_del(struct st_plugin_int *plugin)
if (plugin->plugin_dl)
plugin_dl_del(&plugin->plugin_dl->dl);
plugin->state= PLUGIN_IS_FREED;
- plugin_array_version++;
free_root(&plugin->mem_root, MYF(0));
DBUG_VOID_RETURN;
}
@@ -1824,10 +1822,10 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, const char *list)
case '\0':
list= NULL; /* terminate the loop */
/* fall through */
+ case ';':
#ifndef __WIN__
case ':': /* can't use this as delimiter as it may be drive letter */
#endif
- case ';':
str->str[str->length]= '\0';
if (str == &name) // load all plugins in named module
{
@@ -1865,6 +1863,7 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, const char *list)
str->str= p;
continue;
}
+ /* fall through */
default:
str->length++;
continue;
@@ -2297,64 +2296,55 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name,
bool plugin_foreach_with_mask(THD *thd, plugin_foreach_func *func,
int type, uint state_mask, void *arg)
{
- uint idx, total;
- struct st_plugin_int *plugin, **plugins;
- int version=plugin_array_version;
+ uint idx, total= 0;
+ struct st_plugin_int *plugin;
+ plugin_ref *plugins;
+ my_bool res= FALSE;
DBUG_ENTER("plugin_foreach_with_mask");
if (!initialized)
DBUG_RETURN(FALSE);
- state_mask= ~state_mask; // do it only once
-
mysql_mutex_lock(&LOCK_plugin);
- total= type == MYSQL_ANY_PLUGIN ? plugin_array.elements
- : plugin_hash[type].records;
/*
Do the alloca out here in case we do have a working alloca:
- leaving the nested stack frame invalidates alloca allocation.
+ leaving the nested stack frame invalidates alloca allocation.
*/
- plugins=(struct st_plugin_int **)my_alloca(total*sizeof(plugin));
if (type == MYSQL_ANY_PLUGIN)
{
- for (idx= 0; idx < total; idx++)
+ plugins= (plugin_ref*) my_alloca(plugin_array.elements * sizeof(plugin_ref));
+ for (idx= 0; idx < plugin_array.elements; idx++)
{
plugin= *dynamic_element(&plugin_array, idx, struct st_plugin_int **);
- plugins[idx]= !(plugin->state & state_mask) ? plugin : NULL;
+ if ((plugins[total]= intern_plugin_lock(0, plugin_int_to_ref(plugin),
+ state_mask)))
+ total++;
}
}
else
{
HASH *hash= plugin_hash + type;
- for (idx= 0; idx < total; idx++)
+ plugins= (plugin_ref*) my_alloca(hash->records * sizeof(plugin_ref));
+ for (idx= 0; idx < hash->records; idx++)
{
plugin= (struct st_plugin_int *) my_hash_element(hash, idx);
- plugins[idx]= !(plugin->state & state_mask) ? plugin : NULL;
+ if ((plugins[total]= intern_plugin_lock(0, plugin_int_to_ref(plugin),
+ state_mask)))
+ total++;
}
}
mysql_mutex_unlock(&LOCK_plugin);
for (idx= 0; idx < total; idx++)
{
- if (unlikely(version != plugin_array_version))
- {
- mysql_mutex_lock(&LOCK_plugin);
- for (uint i=idx; i < total; i++)
- if (plugins[i] && plugins[i]->state & state_mask)
- plugins[i]=0;
- mysql_mutex_unlock(&LOCK_plugin);
- }
- plugin= plugins[idx];
/* It will stop iterating on first engine error when "func" returns TRUE */
- if (plugin && func(thd, plugin_int_to_ref(plugin), arg))
- goto err;
+ if ((res= func(thd, plugins[idx], arg)))
+ break;
}
+ plugin_unlock_list(0, plugins, total);
my_afree(plugins);
- DBUG_RETURN(FALSE);
-err:
- my_afree(plugins);
- DBUG_RETURN(TRUE);
+ DBUG_RETURN(res);
}
@@ -3958,4 +3948,3 @@ void add_plugin_options(DYNAMIC_ARRAY *options, MEM_ROOT *mem_root)
insert_dynamic(options, (uchar*) opt);
}
}
-
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 094677e..faaeaf5 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1307,7 +1307,7 @@ static bool mysql_test_insert(Prepared_statement *stmt,
my_error(ER_WRONG_VALUE_COUNT_ON_ROW, MYF(0), counter);
goto error;
}
- if (setup_fields(thd, 0, *values, MARK_COLUMNS_NONE, 0, 0))
+ if (setup_fields(thd, 0, *values, MARK_COLUMNS_NONE, 0, NULL, 0))
goto error;
}
}
@@ -1397,7 +1397,7 @@ static int mysql_test_update(Prepared_statement *stmt,
table_list->register_want_access(want_privilege);
#endif
thd->lex->select_lex.no_wrap_view_item= TRUE;
- res= setup_fields(thd, 0, select->item_list, MARK_COLUMNS_READ, 0, 0);
+ res= setup_fields(thd, 0, select->item_list, MARK_COLUMNS_READ, 0, NULL, 0);
thd->lex->select_lex.no_wrap_view_item= FALSE;
if (res)
goto error;
@@ -1408,7 +1408,8 @@ static int mysql_test_update(Prepared_statement *stmt,
(SELECT_ACL & ~table_list->table->grant.privilege);
table_list->register_want_access(SELECT_ACL);
#endif
- if (setup_fields(thd, 0, stmt->lex->value_list, MARK_COLUMNS_NONE, 0, 0) ||
+ if (setup_fields(thd, 0, stmt->lex->value_list, MARK_COLUMNS_NONE, 0, NULL,
+ 0) ||
check_unique_table(thd, table_list))
goto error;
/* TODO: here we should send types of placeholders to the client. */
@@ -1575,7 +1576,7 @@ static bool mysql_test_do_fields(Prepared_statement *stmt,
if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL,
DT_PREPARE | DT_CREATE))
DBUG_RETURN(TRUE);
- DBUG_RETURN(setup_fields(thd, 0, *values, MARK_COLUMNS_NONE, 0, 0));
+ DBUG_RETURN(setup_fields(thd, 0, *values, MARK_COLUMNS_NONE, 0, NULL, 0));
}
@@ -2074,6 +2075,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
if (res != 2)
break;
+ /* fall through */
case SQLCOM_UPDATE_MULTI:
res= mysql_test_multiupdate(stmt, tables, res == 2);
break;
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 871cb27..ca6e8d1 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1139,6 +1139,7 @@ impossible position";
loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK);
break;
}
+ /* fall through */
default:
errmsg = "could not find next log";
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 720c0a2..c7f547e 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -724,7 +724,7 @@ JOIN::prepare(Item ***rref_pointer_array,
wild_num)) ||
select_lex->setup_ref_array(thd, real_og_num) ||
setup_fields(thd, (*rref_pointer_array), fields_list, MARK_COLUMNS_READ,
- &all_fields, 1) ||
+ &all_fields, &select_lex->pre_fix, 1) ||
setup_without_group(thd, (*rref_pointer_array), tables_list,
select_lex->leaf_tables, fields_list,
all_fields, &conds, order, group_list,
@@ -13349,10 +13349,23 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top,
nested_join= table->nested_join;
if (table->sj_on_expr && !in_sj)
{
- /*
- If this is a semi-join that is not contained within another semi-join,
- leave it intact (otherwise it is flattened)
- */
+ /*
+ If this is a semi-join that is not contained within another semi-join
+ leave it intact (otherwise it is flattened)
+ */
+ /*
+ Make sure that any semi-join appear in
+ the join->select_lex->sj_nests list only once
+ */
+ List_iterator_fast<TABLE_LIST> sj_it(join->select_lex->sj_nests);
+ TABLE_LIST *sj_nest;
+ while ((sj_nest= sj_it++))
+ {
+ if (table == sj_nest)
+ break;
+ }
+ if (sj_nest)
+ continue;
join->select_lex->sj_nests.push_back(table);
/*
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index d8ea232..8789f0c 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -262,7 +262,7 @@ int fill_plugins(THD *thd, TABLE_LIST *tables, COND *cond)
TABLE *table= tables->table;
if (plugin_foreach_with_mask(thd, show_plugins, MYSQL_ANY_PLUGIN,
- ~PLUGIN_IS_FREED, table))
+ ~(PLUGIN_IS_FREED | PLUGIN_IS_DYING), table))
DBUG_RETURN(1);
DBUG_RETURN(0);
@@ -931,6 +931,7 @@ public:
is_handled= FALSE;
break;
}
+ /* fall through */
case ER_COLUMNACCESS_DENIED_ERROR:
case ER_VIEW_NO_EXPLAIN: /* Error was anonymized, ignore all the same. */
case ER_PROCACCESS_DENIED_ERROR:
@@ -5294,7 +5295,8 @@ int fill_schema_engines(THD *thd, TABLE_LIST *tables, COND *cond)
DBUG_ENTER("fill_schema_engines");
if (plugin_foreach_with_mask(thd, iter_schema_engines,
MYSQL_STORAGE_ENGINE_PLUGIN,
- ~PLUGIN_IS_FREED, tables->table))
+ ~(PLUGIN_IS_FREED | PLUGIN_IS_DYING),
+ tables->table))
DBUG_RETURN(1);
DBUG_RETURN(0);
}
@@ -5716,6 +5718,10 @@ int fill_schema_proc(THD *thd, TABLE_LIST *tables, COND *cond)
DBUG_RETURN(1);
}
+ /* Disable padding temporarily so it doesn't break the query */
+ ulonglong sql_mode_was = thd->variables.sql_mode;
+ thd->variables.sql_mode &= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
+
if (proc_table->file->ha_index_init(0, 1))
{
res= 1;
@@ -5751,6 +5757,7 @@ err:
(void) proc_table->file->ha_index_end();
close_system_tables(thd, &open_tables_state_backup);
+ thd->variables.sql_mode = sql_mode_was;
DBUG_RETURN(res);
}
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 6ab39d7..19093d9 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -5504,7 +5504,7 @@ bool alter_table_manage_keys(TABLE *table, int indexes_were_disabled,
case LEAVE_AS_IS:
if (!indexes_were_disabled)
break;
- /* fall-through: disabled indexes */
+ /* fall-through */
case DISABLE:
error= table->file->ha_disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
}
@@ -5739,9 +5739,25 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
{
if (def->change && ! def->field)
{
- my_error(ER_BAD_FIELD_ERROR, MYF(0), def->change,
- table->s->table_name.str);
- goto err;
+ /*
+ Check if there is modify for newly added field.
+ */
+ Create_field *find;
+ find_it.rewind();
+ while((find=find_it++))
+ {
+ if (!my_strcasecmp(system_charset_info,find->field_name, def->field_name))
+ break;
+ }
+
+ if (find && !find->field)
+ find_it.remove();
+ else
+ {
+ my_error(ER_BAD_FIELD_ERROR, MYF(0), def->change,
+ table->s->table_name.str);
+ goto err;
+ }
}
/*
Check that the DATE/DATETIME not null field we are going to add is
@@ -5793,6 +5809,29 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
*/
alter_info->change_level= ALTER_TABLE_DATA_CHANGED;
}
+ /*
+ Check if there is alter for newly added field.
+ */
+ alter_it.rewind();
+ Alter_column *alter;
+ while ((alter=alter_it++))
+ {
+ if (!my_strcasecmp(system_charset_info,def->field_name, alter->name))
+ break;
+ }
+ if (alter)
+ {
+ if (def->sql_type == MYSQL_TYPE_BLOB)
+ {
+ my_error(ER_BLOB_CANT_HAVE_DEFAULT, MYF(0), def->change);
+ goto err;
+ }
+ if ((def->def=alter->def)) // Use new default
+ def->flags&= ~NO_DEFAULT_VALUE_FLAG;
+ else
+ def->flags|= NO_DEFAULT_VALUE_FLAG;
+ alter_it.remove();
+ }
}
if (alter_info->alter_list.elements)
{
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 060952a..ede3846 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -361,7 +361,7 @@ int mysql_update(THD *thd,
table_list->grant.want_privilege= table->grant.want_privilege=
(SELECT_ACL & ~table->grant.privilege);
#endif
- if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, 0))
+ if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, NULL, 0))
{
free_underlaid_joins(thd, select_lex);
DBUG_RETURN(1); /* purecov: inspected */
@@ -1521,7 +1521,7 @@ int multi_update::prepare(List<Item> ¬_used_values,
reference tables
*/
- int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, 0);
+ int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, NULL, 0);
ti.rewind();
while ((table_ref= ti++))
diff --git a/sql/sql_yacc.cc b/sql/sql_yacc.cc
index 9234796..a3700c3 100644
--- a/sql/sql_yacc.cc
+++ b/sql/sql_yacc.cc
@@ -2519,229 +2519,229 @@ static const yytype_uint16 yyrline[] =
3997, 3998, 3999, 4000, 4001, 4005, 4009, 4010, 4011, 4015,
4016, 4017, 4022, 4030, 4038, 4046, 4058, 4070, 4075, 4080,
4088, 4096, 4104, 4112, 4120, 4128, 4136, 4149, 4162, 4175,
- 4177, 4181, 4186, 4199, 4200, 4251, 4252, 4255, 4269, 4287,
- 4286, 4295, 4293, 4300, 4302, 4301, 4305, 4304, 4310, 4347,
- 4348, 4353, 4352, 4371, 4390, 4389, 4406, 4410, 4418, 4417,
- 4420, 4422, 4424, 4426, 4431, 4432, 4438, 4439, 4456, 4457,
- 4461, 4462, 4466, 4485, 4495, 4506, 4515, 4516, 4532, 4534,
- 4533, 4538, 4536, 4547, 4548, 4552, 4570, 4586, 4587, 4603,
- 4618, 4640, 4641, 4646, 4645, 4669, 4681, 4703, 4702, 4720,
- 4719, 4739, 4761, 4765, 4794, 4806, 4807, 4812, 4823, 4811,
- 4848, 4849, 4853, 4866, 4887, 4900, 4926, 4927, 4932, 4931,
- 4968, 4977, 4978, 4982, 4983, 4987, 4989, 4995, 5001, 5003,
- 5005, 5007, 5009, 5011, 5021, 5036, 5020, 5050, 5051, 5055,
- 5056, 5060, 5061, 5065, 5066, 5070, 5071, 5075, 5076, 5080,
- 5084, 5085, 5088, 5090, 5094, 5095, 5099, 5100, 5101, 5105,
- 5110, 5115, 5120, 5125, 5130, 5135, 5140, 5155, 5161, 5166,
- 5171, 5176, 5181, 5187, 5186, 5212, 5213, 5214, 5219, 5224,
- 5229, 5231, 5233, 5235, 5241, 5246, 5251, 5257, 5263, 5269,
- 5278, 5296, 5313, 5336, 5350, 5351, 5352, 5353, 5354, 5355,
- 5356, 5360, 5361, 5362, 5366, 5367, 5371, 5372, 5373, 5374,
- 5379, 5386, 5387, 5391, 5392, 5396, 5397, 5405, 5404, 5413,
- 5411, 5421, 5419, 5429, 5427, 5435, 5454, 5460, 5462, 5466,
- 5470, 5471, 5475, 5480, 5479, 5505, 5508, 5507, 5517, 5519,
- 5524, 5527, 5531, 5538, 5539, 5543, 5544, 5548, 5554, 5560,
- 5564, 5580, 5596, 5597, 5598, 5599, 5604, 5608, 5613, 5618,
- 5622, 5627, 5632, 5638, 5643, 5649, 5653, 5658, 5663, 5681,
- 5683, 5685, 5698, 5700, 5705, 5710, 5722, 5727, 5732, 5737,
- 5739, 5741, 5743, 5745, 5747, 5749, 5751, 5754, 5753, 5758,
- 5757, 5761, 5763, 5772, 5773, 5774, 5780, 5781, 5782, 5783,
- 5784, 5788, 5792, 5793, 5797, 5798, 5802, 5803, 5804, 5805,
- 5806, 5810, 5811, 5812, 5813, 5814, 5818, 5823, 5825, 5831,
- 5832, 5834, 5839, 5848, 5849, 5853, 5854, 5858, 5859, 5860,
- 5864, 5865, 5866, 5867, 5870, 5871, 5875, 5876, 5880, 5881,
- 5885, 5886, 5890, 5891, 5892, 5893, 5900, 5901, 5907, 5913,
- 5919, 5925, 5926, 5939, 5945, 5951, 5957, 5966, 5987, 5993,
- 5998, 5999, 6003, 6004, 6008, 6016, 6020, 6021, 6025, 6026,
- 6030, 6039, 6043, 6044, 6048, 6059, 6060, 6064, 6065, 6069,
- 6070, 6075, 6076, 6080, 6087, 6096, 6104, 6115, 6116, 6117,
- 6118, 6119, 6120, 6125, 6133, 6134, 6138, 6140, 6144, 6156,
- 6157, 6161, 6168, 6181, 6182, 6184, 6186, 6192, 6197, 6203,
- 6209, 6216, 6226, 6227, 6228, 6229, 6230, 6234, 6238, 6239,
- 6243, 6244, 6248, 6249, 6253, 6254, 6255, 6259, 6260, 6264,
- 6268, 6281, 6293, 6294, 6298, 6299, 6303, 6304, 6308, 6309,
- 6313, 6314, 6318, 6319, 6323, 6324, 6328, 6329, 6333, 6335,
- 6336, 6342, 6348, 6354, 6362, 6363, 6367, 6371, 6372, 6385,
- 6386, 6387, 6391, 6392, 6396, 6402, 6416, 6417, 6421, 6422,
- 6426, 6427, 6435, 6434, 6471, 6470, 6484, 6496, 6495, 6514,
- 6513, 6532, 6531, 6550, 6544, 6564, 6563, 6596, 6601, 6606,
- 6611, 6616, 6626, 6627, 6628, 6629, 6633, 6634, 6646, 6647,
- 6651, 6652, 6655, 6657, 6658, 6659, 6661, 6663, 6664, 6673,
- 6674, 6678, 6687, 6685, 6698, 6711, 6710, 6723, 6721, 6734,
- 6741, 6751, 6755, 6762, 6766, 6771, 6770, 6786, 6788, 6793,
- 6801, 6800, 6816, 6820, 6819, 6831, 6832, 6836, 6851, 6852,
- 6856, 6865, 6869, 6874, 6879, 6878, 6890, 6901, 6889, 6917,
- 6926, 6930, 6939, 6948, 6954, 6960, 6969, 6978, 6997, 7017,
- 7027, 7031, 7039, 7040, 7044, 7045, 7049, 7049, 7052, 7054,
- 7058, 7059, 7063, 7064, 7068, 7069, 7070, 7074, 7075, 7076,
- 7080, 7081, 7082, 7083, 7092, 7091, 7100, 7108, 7107, 7115,
- 7124, 7133, 7134, 7141, 7141, 7147, 7148, 7152, 7153, 7154,
- 7158, 7159, 7175, 7176, 7181, 7180, 7192, 7193, 7194, 7198,
- 7199, 7199, 7204, 7203, 7224, 7225, 7229, 7230, 7234, 7235,
- 7236, 7240, 7241, 7246, 7245, 7266, 7274, 7275, 7275, 7279,
- 7278, 7304, 7305, 7309, 7310, 7314, 7315, 7316, 7317, 7318,
- 7319, 7323, 7324, 7329, 7328, 7349, 7350, 7351, 7356, 7355,
- 7361, 7368, 7373, 7381, 7382, 7386, 7400, 7399, 7412, 7413,
- 7417, 7418, 7422, 7432, 7442, 7443, 7448, 7447, 7458, 7459,
- 7463, 7464, 7468, 7478, 7489, 7488, 7496, 7496, 7505, 7506,
- 7511, 7512, 7521, 7530, 7531, 7535, 7540, 7545, 7550, 7555,
- 7554, 7574, 7582, 7574, 7589, 7590, 7591, 7592, 7593, 7597,
- 7604, 7611, 7613, 7624, 7625, 7629, 7630, 7658, 7688, 7690,
- 7696, 7706, 7707, 7708, 7722, 7727, 7752, 7758, 7764, 7765,
- 7766, 7767, 7768, 7772, 7773, 7774, 7778, 7779, 7784, 7835,
- 7842, 7885, 7891, 7897, 7903, 7909, 7915, 7921, 7927, 7931,
- 7937, 7943, 7949, 7955, 7961, 7965, 7971, 7980, 7986, 7994,
- 8000, 8010, 8016, 8025, 8035, 8041, 8051, 8057, 8066, 8070,
- 8076, 8082, 8088, 8094, 8100, 8106, 8112, 8118, 8124, 8130,
- 8136, 8142, 8148, 8154, 8158, 8159, 8163, 8164, 8168, 8169,
- 8173, 8174, 8178, 8179, 8180, 8181, 8182, 8183, 8187, 8188,
- 8193, 8199, 8203, 8210, 8217, 8224, 8231, 8238, 8243, 8249,
- 8256, 8263, 8271, 8282, 8304, 8311, 8319, 8320, 8321, 8322,
- 8323, 8324, 8335, 8336, 8337, 8338, 8339, 8345, 8349, 8355,
- 8361, 8367, 8373, 8375, 8382, 8389, 8395, 8397, 8406, 8413,
- 8421, 8427, 8434, 8440, 8454, 8461, 8477, 8483, 8489, 8497,
- 8503, 8509, 8515, 8521, 8535, 8546, 8552, 8558, 8564, 8570,
- 8576, 8582, 8588, 8594, 8600, 8606, 8612, 8618, 8624, 8630,
- 8636, 8642, 8650, 8671, 8678, 8684, 8691, 8698, 8705, 8712,
- 8718, 8724, 8731, 8737, 8744, 8750, 8756, 8762, 8768, 8774,
- 8792, 8798, 8804, 8811, 8818, 8826, 8833, 8840, 8847, 8854,
- 8861, 8878, 8884, 8890, 8896, 8902, 8909, 8915, 8921, 8927,
- 8933, 8939, 8950, 8956, 8962, 8968, 8974, 8985, 8991, 9007,
- 9013, 9020, 9027, 9034, 9041, 9048, 9052, 9072, 9071, 9143,
- 9184, 9186, 9191, 9192, 9196, 9197, 9201, 9202, 9206, 9213,
- 9221, 9248, 9254, 9260, 9266, 9272, 9278, 9287, 9294, 9296,
- 9293, 9303, 9314, 9320, 9326, 9332, 9338, 9344, 9350, 9356,
- 9362, 9369, 9368, 9388, 9387, 9402, 9412, 9420, 9436, 9437,
- 9442, 9447, 9450, 9453, 9452, 9469, 9471, 9477, 9476, 9493,
- 9495, 9497, 9499, 9501, 9503, 9505, 9507, 9509, 9511, 9517,
- 9523, 9526, 9525, 9531, 9532, 9536, 9543, 9551, 9552, 9556,
- 9563, 9571, 9572, 9576, 9577, 9581, 9589, 9600, 9601, 9613,
- 9624, 9625, 9631, 9632, 9652, 9654, 9658, 9656, 9673, 9671,
- 9689, 9687, 9694, 9703, 9701, 9719, 9718, 9728, 9739, 9737,
- 9756, 9755, 9766, 9777, 9778, 9779, 9791, 9791, 9805, 9845,
- 9930, 9941, 9946, 9938, 9965, 9985, 9993, 9985, 10002, 10001,
- 10024, 10041, 10024, 10048, 10052, 10078, 10079, 10084, 10087, 10088,
- 10089, 10093, 10094, 10099, 10098, 10104, 10103, 10111, 10112, 10115,
- 10117, 10117, 10121, 10121, 10126, 10127, 10131, 10133, 10138, 10139,
- 10143, 10154, 10167, 10168, 10169, 10170, 10171, 10172, 10173, 10174,
- 10175, 10176, 10177, 10178, 10182, 10183, 10184, 10185, 10186, 10187,
- 10188, 10189, 10190, 10194, 10195, 10196, 10197, 10200, 10202, 10203,
- 10207, 10208, 10216, 10218, 10222, 10224, 10223, 10237, 10240, 10239,
- 10254, 10260, 10274, 10276, 10280, 10282, 10287, 10288, 10308, 10333,
- 10337, 10338, 10342, 10354, 10356, 10361, 10360, 10395, 10397, 10402,
- 10403, 10404, 10409, 10416, 10420, 10421, 10425, 10429, 10433, 10440,
- 10447, 10454, 10464, 10497, 10501, 10507, 10513, 10522, 10530, 10534,
- 10541, 10542, 10546, 10547, 10548, 10552, 10553, 10554, 10555, 10556,
- 10557, 10561, 10562, 10563, 10564, 10565, 10569, 10570, 10571, 10572,
- 10573, 10577, 10578, 10579, 10580, 10581, 10585, 10590, 10591, 10595,
- 10596, 10599, 10602, 10601, 10644, 10645, 10649, 10650, 10654, 10664,
- 10664, 10674, 10675, 10679, 10698, 10731, 10730, 10743, 10751, 10742,
- 10753, 10765, 10777, 10776, 10794, 10793, 10804, 10804, 10820, 10827,
- 10849, 10869, 10881, 10886, 10885, 10895, 10901, 10908, 10913, 10918,
- 10928, 10929, 10933, 10944, 10945, 10949, 10960, 10961, 10965, 10966,
- 10974, 10982, 10973, 10992, 10999, 10991, 11009, 11017, 11018, 11026,
- 11030, 11031, 11042, 11043, 11047, 11056, 11057, 11058, 11060, 11059,
- 11070, 11071, 11075, 11076, 11078, 11077, 11081, 11080, 11086, 11087,
- 11091, 11092, 11096, 11106, 11107, 11111, 11112, 11117, 11116, 11130,
- 11131, 11135, 11140, 11148, 11149, 11157, 11159, 11159, 11167, 11175,
- 11166, 11197, 11198, 11202, 11210, 11211, 11215, 11225, 11226, 11233,
- 11232, 11248, 11247, 11259, 11258, 11270, 11269, 11283, 11284, 11288,
- 11301, 11317, 11318, 11322, 11323, 11327, 11328, 11329, 11334, 11333,
- 11354, 11356, 11359, 11361, 11364, 11365, 11368, 11372, 11376, 11380,
- 11384, 11388, 11392, 11396, 11400, 11408, 11411, 11421, 11420, 11435,
- 11442, 11450, 11458, 11466, 11474, 11482, 11489, 11491, 11493, 11502,
- 11506, 11511, 11510, 11516, 11515, 11520, 11529, 11536, 11545, 11554,
- 11559, 11561, 11563, 11565, 11567, 11569, 11576, 11584, 11586, 11594,
- 11601, 11608, 11618, 11625, 11631, 11639, 11647, 11651, 11655, 11662,
- 11669, 11676, 11683, 11690, 11697, 11703, 11710, 11717, 11722, 11727,
- 11735, 11737, 11739, 11744, 11745, 11748, 11750, 11754, 11755, 11759,
- 11760, 11764, 11765, 11769, 11770, 11774, 11775, 11778, 11780, 11787,
- 11798, 11797, 11813, 11812, 11822, 11823, 11827, 11828, 11829, 11833,
- 11834, 11835, 11850, 11849, 11862, 11871, 11861, 11873, 11877, 11878,
- 11892, 11893, 11898, 11900, 11902, 11904, 11906, 11908, 11910, 11912,
- 11914, 11916, 11918, 11920, 11925, 11927, 11929, 11931, 11933, 11935,
- 11937, 11942, 11943, 11947, 11948, 11952, 11951, 11961, 11962, 11966,
- 11966, 11968, 11969, 11973, 11974, 11979, 11978, 11989, 11993, 11997,
- 12010, 12009, 12023, 12024, 12025, 12028, 12029, 12030, 12034, 12039,
- 12049, 12061, 12072, 12082, 12092, 12060, 12100, 12101, 12105, 12106,
- 12110, 12111, 12119, 12123, 12124, 12125, 12128, 12130, 12134, 12135,
- 12139, 12144, 12151, 12156, 12163, 12165, 12169, 12170, 12174, 12179,
- 12187, 12188, 12191, 12193, 12201, 12203, 12207, 12208, 12209, 12213,
- 12215, 12220, 12221, 12230, 12231, 12235, 12236, 12240, 12253, 12276,
- 12288, 12299, 12318, 12326, 12338, 12346, 12361, 12381, 12382, 12383,
- 12391, 12392, 12393, 12400, 12406, 12412, 12418, 12424, 12430, 12459,
- 12487, 12488, 12489, 12493, 12503, 12513, 12519, 12528, 12543, 12544,
- 12548, 12557, 12572, 12576, 12622, 12626, 12643, 12647, 12725, 12749,
- 12779, 12780, 12796, 12806, 12810, 12816, 12822, 12832, 12838, 12847,
- 12857, 12858, 12886, 12900, 12914, 12929, 12930, 12940, 12941, 12951,
- 12952, 12953, 12957, 12973, 12994, 13009, 13010, 13011, 13012, 13013,
- 13014, 13015, 13016, 13017, 13018, 13019, 13020, 13021, 13022, 13023,
- 13024, 13025, 13026, 13027, 13028, 13029, 13030, 13031, 13032, 13033,
- 13034, 13035, 13036, 13037, 13038, 13039, 13040, 13041, 13042, 13043,
- 13044, 13045, 13046, 13047, 13048, 13049, 13050, 13051, 13052, 13053,
- 13054, 13055, 13056, 13057, 13058, 13059, 13060, 13061, 13062, 13063,
- 13064, 13065, 13066, 13067, 13077, 13078, 13079, 13080, 13081, 13082,
- 13083, 13084, 13085, 13086, 13087, 13088, 13089, 13090, 13091, 13092,
- 13093, 13094, 13095, 13096, 13097, 13098, 13099, 13100, 13101, 13102,
- 13103, 13104, 13105, 13106, 13107, 13108, 13109, 13110, 13111, 13112,
- 13113, 13114, 13115, 13116, 13117, 13118, 13119, 13120, 13121, 13122,
- 13123, 13124, 13125, 13126, 13127, 13128, 13129, 13130, 13131, 13132,
- 13133, 13134, 13135, 13136, 13137, 13138, 13139, 13140, 13141, 13142,
- 13143, 13144, 13145, 13146, 13147, 13148, 13149, 13150, 13151, 13152,
- 13153, 13154, 13155, 13156, 13157, 13158, 13159, 13160, 13161, 13162,
- 13163, 13164, 13165, 13166, 13167, 13168, 13169, 13170, 13171, 13172,
- 13173, 13174, 13175, 13176, 13177, 13178, 13179, 13180, 13181, 13182,
- 13183, 13184, 13185, 13186, 13187, 13188, 13189, 13190, 13191, 13192,
- 13193, 13194, 13195, 13196, 13197, 13198, 13199, 13200, 13201, 13202,
- 13203, 13204, 13205, 13206, 13207, 13208, 13209, 13210, 13211, 13212,
- 13213, 13214, 13215, 13216, 13217, 13218, 13219, 13220, 13221, 13222,
- 13223, 13224, 13225, 13226, 13227, 13228, 13229, 13230, 13231, 13232,
- 13233, 13234, 13235, 13236, 13237, 13238, 13239, 13240, 13241, 13242,
- 13243, 13244, 13245, 13246, 13247, 13248, 13249, 13250, 13251, 13252,
- 13253, 13254, 13255, 13256, 13257, 13258, 13259, 13260, 13261, 13262,
- 13263, 13264, 13265, 13266, 13267, 13268, 13269, 13270, 13271, 13272,
- 13273, 13274, 13275, 13276, 13277, 13278, 13279, 13280, 13281, 13282,
- 13283, 13284, 13285, 13286, 13287, 13288, 13289, 13290, 13291, 13292,
- 13293, 13294, 13295, 13296, 13297, 13298, 13299, 13300, 13301, 13302,
- 13303, 13304, 13305, 13306, 13307, 13308, 13309, 13310, 13311, 13312,
- 13313, 13314, 13315, 13316, 13317, 13318, 13319, 13320, 13321, 13322,
- 13323, 13324, 13325, 13326, 13327, 13328, 13329, 13330, 13331, 13332,
- 13333, 13334, 13335, 13336, 13337, 13338, 13339, 13340, 13341, 13342,
- 13343, 13344, 13345, 13346, 13347, 13348, 13349, 13350, 13351, 13352,
- 13353, 13354, 13355, 13356, 13357, 13358, 13359, 13360, 13361, 13362,
- 13363, 13364, 13365, 13366, 13367, 13368, 13369, 13376, 13375, 13390,
- 13391, 13395, 13396, 13400, 13400, 13480, 13481, 13482, 13483, 13487,
- 13488, 13492, 13493, 13494, 13495, 13499, 13500, 13501, 13502, 13506,
- 13507, 13511, 13552, 13570, 13581, 13593, 13606, 13621, 13640, 13666,
- 13679, 13705, 13748, 13762, 13763, 13764, 13765, 13769, 13770, 13779,
- 13791, 13792, 13793, 13799, 13805, 13817, 13816, 13832, 13833, 13837,
- 13838, 13842, 13857, 13858, 13859, 13864, 13865, 13870, 13869, 13889,
- 13901, 13914, 13913, 13947, 13948, 13952, 13953, 13957, 13958, 13959,
- 13960, 13962, 13961, 13974, 13975, 13976, 13977, 13978, 13984, 13989,
- 13995, 14006, 14017, 14021, 14031, 14036, 14043, 14055, 14067, 14076,
- 14078, 14082, 14083, 14090, 14092, 14096, 14097, 14102, 14101, 14105,
- 14104, 14108, 14107, 14111, 14110, 14113, 14114, 14115, 14116, 14117,
- 14118, 14119, 14120, 14121, 14122, 14123, 14124, 14125, 14126, 14127,
- 14128, 14129, 14130, 14131, 14132, 14133, 14134, 14135, 14136, 14137,
- 14138, 14142, 14143, 14147, 14148, 14152, 14162, 14172, 14185, 14200,
- 14213, 14226, 14238, 14243, 14251, 14256, 14263, 14263, 14264, 14264,
- 14267, 14294, 14299, 14305, 14311, 14317, 14321, 14325, 14326, 14330,
- 14357, 14359, 14363, 14367, 14371, 14378, 14379, 14383, 14384, 14388,
- 14389, 14393, 14394, 14400, 14406, 14412, 14422, 14421, 14431, 14432,
- 14437, 14438, 14439, 14444, 14445, 14446, 14450, 14451, 14455, 14467,
- 14476, 14486, 14495, 14509, 14510, 14515, 14514, 14530, 14531, 14532,
- 14536, 14537, 14541, 14541, 14563, 14564, 14568, 14569, 14570, 14574,
- 14578, 14585, 14588, 14586, 14602, 14609, 14630, 14654, 14656, 14660,
- 14661, 14665, 14666, 14674, 14675, 14676, 14677, 14683, 14689, 14699,
- 14701, 14703, 14708, 14709, 14710, 14711, 14712, 14716, 14717, 14718,
- 14719, 14720, 14721, 14731, 14732, 14737, 14750, 14763, 14765, 14767,
- 14772, 14777, 14779, 14781, 14787, 14788, 14790, 14796, 14795, 14812,
- 14813, 14817, 14822, 14830, 14830, 14854, 14855, 14860, 14861, 14863,
- 14865, 14883, 14889, 14894, 14876, 14955, 14972, 14996, 15027, 15031,
- 15040, 15063, 14992, 15126, 15150, 15159, 15166, 15125, 15186, 15190,
- 15194, 15198, 15202, 15206, 15213, 15220, 15227, 15237, 15238, 15242,
- 15243, 15244, 15248, 15249, 15254, 15256, 15255, 15261, 15262, 15266,
- 15273, 15283, 15289, 15300
+ 4177, 4181, 4186, 4199, 4200, 4247, 4248, 4251, 4265, 4283,
+ 4282, 4291, 4289, 4296, 4298, 4297, 4301, 4300, 4306, 4343,
+ 4344, 4349, 4348, 4367, 4386, 4385, 4402, 4406, 4414, 4413,
+ 4416, 4418, 4420, 4422, 4427, 4428, 4434, 4435, 4452, 4453,
+ 4457, 4458, 4462, 4481, 4491, 4502, 4511, 4512, 4528, 4530,
+ 4529, 4534, 4532, 4543, 4544, 4548, 4566, 4582, 4583, 4599,
+ 4614, 4636, 4637, 4642, 4641, 4665, 4677, 4699, 4698, 4716,
+ 4715, 4735, 4757, 4761, 4790, 4802, 4803, 4808, 4819, 4807,
+ 4844, 4845, 4849, 4862, 4883, 4896, 4922, 4923, 4928, 4927,
+ 4964, 4973, 4974, 4978, 4979, 4983, 4985, 4991, 4997, 4999,
+ 5001, 5003, 5005, 5007, 5017, 5032, 5016, 5046, 5047, 5051,
+ 5052, 5056, 5057, 5061, 5062, 5066, 5067, 5071, 5072, 5076,
+ 5080, 5081, 5084, 5086, 5090, 5091, 5095, 5096, 5097, 5101,
+ 5106, 5111, 5116, 5121, 5126, 5131, 5136, 5151, 5157, 5162,
+ 5167, 5172, 5177, 5183, 5182, 5208, 5209, 5210, 5215, 5220,
+ 5225, 5227, 5229, 5231, 5237, 5242, 5247, 5253, 5259, 5265,
+ 5274, 5292, 5309, 5332, 5346, 5347, 5348, 5349, 5350, 5351,
+ 5352, 5356, 5357, 5358, 5362, 5363, 5367, 5368, 5369, 5370,
+ 5375, 5382, 5383, 5387, 5388, 5392, 5393, 5401, 5400, 5409,
+ 5407, 5417, 5415, 5425, 5423, 5431, 5450, 5456, 5458, 5462,
+ 5466, 5467, 5471, 5476, 5475, 5501, 5504, 5503, 5513, 5515,
+ 5520, 5523, 5527, 5534, 5535, 5539, 5540, 5544, 5550, 5556,
+ 5560, 5576, 5592, 5593, 5594, 5595, 5600, 5604, 5609, 5614,
+ 5618, 5623, 5628, 5634, 5639, 5645, 5649, 5654, 5659, 5677,
+ 5679, 5681, 5694, 5696, 5701, 5706, 5718, 5723, 5728, 5733,
+ 5735, 5737, 5739, 5741, 5743, 5745, 5747, 5750, 5749, 5754,
+ 5753, 5757, 5759, 5768, 5769, 5770, 5776, 5777, 5778, 5779,
+ 5780, 5784, 5788, 5789, 5793, 5794, 5798, 5799, 5800, 5801,
+ 5802, 5806, 5807, 5808, 5809, 5810, 5814, 5819, 5821, 5827,
+ 5828, 5830, 5835, 5844, 5845, 5849, 5850, 5854, 5855, 5856,
+ 5860, 5861, 5862, 5863, 5866, 5867, 5871, 5872, 5876, 5877,
+ 5881, 5882, 5886, 5887, 5888, 5889, 5896, 5897, 5903, 5909,
+ 5915, 5921, 5922, 5935, 5941, 5947, 5953, 5962, 5983, 5989,
+ 5994, 5995, 5999, 6000, 6004, 6012, 6016, 6017, 6021, 6022,
+ 6026, 6035, 6039, 6040, 6044, 6055, 6056, 6060, 6061, 6065,
+ 6066, 6071, 6072, 6076, 6083, 6092, 6100, 6111, 6112, 6113,
+ 6114, 6115, 6116, 6121, 6129, 6130, 6134, 6136, 6140, 6152,
+ 6153, 6157, 6164, 6177, 6178, 6180, 6182, 6188, 6193, 6199,
+ 6205, 6212, 6222, 6223, 6224, 6225, 6226, 6230, 6234, 6235,
+ 6239, 6240, 6244, 6245, 6249, 6250, 6251, 6255, 6256, 6260,
+ 6264, 6277, 6289, 6290, 6294, 6295, 6299, 6300, 6304, 6305,
+ 6309, 6310, 6314, 6315, 6319, 6320, 6324, 6325, 6329, 6331,
+ 6332, 6338, 6344, 6350, 6358, 6359, 6363, 6367, 6368, 6381,
+ 6382, 6383, 6387, 6388, 6392, 6398, 6412, 6413, 6417, 6418,
+ 6422, 6423, 6431, 6430, 6467, 6466, 6480, 6492, 6491, 6510,
+ 6509, 6528, 6527, 6546, 6540, 6560, 6559, 6592, 6597, 6602,
+ 6607, 6612, 6622, 6623, 6624, 6625, 6629, 6630, 6642, 6643,
+ 6647, 6648, 6651, 6653, 6654, 6655, 6657, 6659, 6660, 6669,
+ 6670, 6674, 6683, 6681, 6694, 6707, 6706, 6719, 6717, 6730,
+ 6737, 6747, 6751, 6758, 6762, 6767, 6766, 6782, 6784, 6789,
+ 6797, 6796, 6812, 6816, 6815, 6827, 6828, 6832, 6847, 6848,
+ 6852, 6861, 6865, 6870, 6875, 6874, 6886, 6897, 6885, 6913,
+ 6922, 6926, 6935, 6944, 6950, 6956, 6965, 6974, 6993, 7013,
+ 7023, 7027, 7035, 7036, 7040, 7041, 7045, 7045, 7048, 7050,
+ 7054, 7055, 7059, 7060, 7064, 7065, 7066, 7070, 7071, 7072,
+ 7076, 7077, 7078, 7079, 7088, 7087, 7096, 7104, 7103, 7111,
+ 7120, 7129, 7130, 7137, 7137, 7143, 7144, 7148, 7149, 7150,
+ 7154, 7155, 7171, 7172, 7177, 7176, 7188, 7189, 7190, 7194,
+ 7195, 7195, 7200, 7199, 7220, 7221, 7225, 7226, 7230, 7231,
+ 7232, 7236, 7237, 7242, 7241, 7262, 7270, 7271, 7271, 7275,
+ 7274, 7300, 7301, 7305, 7306, 7310, 7311, 7312, 7313, 7314,
+ 7315, 7319, 7320, 7325, 7324, 7345, 7346, 7347, 7352, 7351,
+ 7357, 7364, 7369, 7377, 7378, 7382, 7396, 7395, 7408, 7409,
+ 7413, 7414, 7418, 7428, 7438, 7439, 7444, 7443, 7454, 7455,
+ 7459, 7460, 7464, 7474, 7485, 7484, 7492, 7492, 7501, 7502,
+ 7507, 7508, 7517, 7526, 7527, 7531, 7536, 7541, 7546, 7551,
+ 7550, 7570, 7578, 7570, 7585, 7586, 7587, 7588, 7589, 7593,
+ 7600, 7607, 7609, 7620, 7621, 7625, 7626, 7654, 7684, 7686,
+ 7692, 7702, 7703, 7704, 7718, 7723, 7748, 7754, 7760, 7761,
+ 7762, 7763, 7764, 7768, 7769, 7770, 7774, 7775, 7780, 7831,
+ 7838, 7881, 7887, 7893, 7899, 7905, 7911, 7917, 7923, 7927,
+ 7933, 7939, 7945, 7951, 7957, 7961, 7967, 7976, 7982, 7990,
+ 7996, 8006, 8012, 8021, 8031, 8037, 8047, 8053, 8062, 8066,
+ 8072, 8078, 8084, 8090, 8096, 8102, 8108, 8114, 8120, 8126,
+ 8132, 8138, 8144, 8150, 8154, 8155, 8159, 8160, 8164, 8165,
+ 8169, 8170, 8174, 8175, 8176, 8177, 8178, 8179, 8183, 8184,
+ 8189, 8195, 8199, 8206, 8213, 8220, 8227, 8234, 8239, 8245,
+ 8252, 8259, 8267, 8278, 8300, 8307, 8315, 8316, 8317, 8318,
+ 8319, 8320, 8331, 8332, 8333, 8334, 8335, 8341, 8345, 8351,
+ 8357, 8363, 8369, 8371, 8378, 8385, 8391, 8393, 8402, 8409,
+ 8417, 8423, 8430, 8436, 8450, 8457, 8473, 8479, 8485, 8493,
+ 8499, 8505, 8511, 8517, 8531, 8542, 8548, 8554, 8560, 8566,
+ 8572, 8578, 8584, 8590, 8596, 8602, 8608, 8614, 8620, 8626,
+ 8632, 8638, 8646, 8667, 8674, 8680, 8687, 8694, 8701, 8708,
+ 8714, 8720, 8727, 8733, 8740, 8746, 8752, 8758, 8764, 8770,
+ 8788, 8794, 8800, 8807, 8814, 8822, 8829, 8836, 8843, 8850,
+ 8857, 8874, 8880, 8886, 8892, 8898, 8905, 8911, 8917, 8923,
+ 8929, 8935, 8946, 8952, 8958, 8964, 8970, 8981, 8987, 9003,
+ 9009, 9016, 9023, 9030, 9037, 9044, 9048, 9068, 9067, 9139,
+ 9180, 9182, 9187, 9188, 9192, 9193, 9197, 9198, 9202, 9209,
+ 9217, 9244, 9250, 9256, 9262, 9268, 9274, 9283, 9290, 9292,
+ 9289, 9299, 9310, 9316, 9322, 9328, 9334, 9340, 9346, 9352,
+ 9358, 9365, 9364, 9384, 9383, 9398, 9408, 9416, 9432, 9433,
+ 9438, 9443, 9446, 9449, 9448, 9465, 9467, 9473, 9472, 9489,
+ 9491, 9493, 9495, 9497, 9499, 9501, 9503, 9505, 9507, 9513,
+ 9519, 9522, 9521, 9527, 9528, 9532, 9539, 9547, 9548, 9552,
+ 9559, 9567, 9568, 9572, 9573, 9577, 9585, 9596, 9597, 9609,
+ 9620, 9621, 9627, 9628, 9648, 9650, 9654, 9652, 9669, 9667,
+ 9685, 9683, 9690, 9699, 9697, 9715, 9714, 9724, 9735, 9733,
+ 9752, 9751, 9762, 9773, 9774, 9775, 9787, 9787, 9801, 9841,
+ 9926, 9937, 9942, 9934, 9961, 9981, 9989, 9981, 9998, 9997,
+ 10020, 10037, 10020, 10044, 10048, 10074, 10075, 10080, 10083, 10084,
+ 10085, 10089, 10090, 10095, 10094, 10100, 10099, 10107, 10108, 10111,
+ 10113, 10113, 10117, 10117, 10122, 10123, 10127, 10129, 10134, 10135,
+ 10139, 10150, 10163, 10164, 10165, 10166, 10167, 10168, 10169, 10170,
+ 10171, 10172, 10173, 10174, 10178, 10179, 10180, 10181, 10182, 10183,
+ 10184, 10185, 10186, 10190, 10191, 10192, 10193, 10196, 10198, 10199,
+ 10203, 10204, 10212, 10214, 10218, 10220, 10219, 10233, 10236, 10235,
+ 10250, 10256, 10270, 10272, 10276, 10278, 10283, 10284, 10304, 10329,
+ 10333, 10334, 10338, 10350, 10352, 10357, 10356, 10391, 10393, 10398,
+ 10399, 10400, 10405, 10412, 10416, 10417, 10421, 10425, 10429, 10436,
+ 10443, 10450, 10460, 10493, 10497, 10503, 10509, 10518, 10526, 10530,
+ 10537, 10538, 10542, 10543, 10544, 10548, 10549, 10550, 10551, 10552,
+ 10553, 10557, 10558, 10559, 10560, 10561, 10565, 10566, 10567, 10568,
+ 10569, 10573, 10574, 10575, 10576, 10577, 10581, 10586, 10587, 10591,
+ 10592, 10595, 10598, 10597, 10640, 10641, 10645, 10646, 10650, 10660,
+ 10660, 10670, 10671, 10675, 10694, 10727, 10726, 10739, 10747, 10738,
+ 10749, 10761, 10773, 10772, 10790, 10789, 10800, 10800, 10816, 10823,
+ 10845, 10865, 10877, 10882, 10881, 10891, 10897, 10904, 10909, 10914,
+ 10924, 10925, 10929, 10940, 10941, 10945, 10956, 10957, 10961, 10962,
+ 10970, 10978, 10969, 10988, 10995, 10987, 11005, 11013, 11014, 11022,
+ 11026, 11027, 11038, 11039, 11043, 11052, 11053, 11054, 11056, 11055,
+ 11066, 11067, 11071, 11072, 11074, 11073, 11077, 11076, 11082, 11083,
+ 11087, 11088, 11092, 11102, 11103, 11107, 11108, 11113, 11112, 11126,
+ 11127, 11131, 11136, 11144, 11145, 11153, 11155, 11155, 11163, 11171,
+ 11162, 11193, 11194, 11198, 11206, 11207, 11211, 11221, 11222, 11229,
+ 11228, 11244, 11243, 11255, 11254, 11266, 11265, 11279, 11280, 11284,
+ 11297, 11313, 11314, 11318, 11319, 11323, 11324, 11325, 11330, 11329,
+ 11350, 11352, 11355, 11357, 11360, 11361, 11364, 11368, 11372, 11376,
+ 11380, 11384, 11388, 11392, 11396, 11404, 11407, 11417, 11416, 11431,
+ 11438, 11446, 11454, 11462, 11470, 11478, 11485, 11487, 11489, 11498,
+ 11502, 11507, 11506, 11512, 11511, 11516, 11525, 11532, 11541, 11550,
+ 11555, 11557, 11559, 11561, 11563, 11565, 11572, 11580, 11582, 11590,
+ 11597, 11604, 11614, 11621, 11627, 11635, 11643, 11647, 11651, 11658,
+ 11665, 11672, 11679, 11686, 11693, 11699, 11706, 11713, 11718, 11723,
+ 11731, 11733, 11735, 11740, 11741, 11744, 11746, 11750, 11751, 11755,
+ 11756, 11760, 11761, 11765, 11766, 11770, 11771, 11774, 11776, 11783,
+ 11794, 11793, 11809, 11808, 11818, 11819, 11823, 11824, 11825, 11829,
+ 11830, 11831, 11846, 11845, 11858, 11867, 11857, 11869, 11873, 11874,
+ 11888, 11889, 11894, 11896, 11898, 11900, 11902, 11904, 11906, 11908,
+ 11910, 11912, 11914, 11916, 11921, 11923, 11925, 11927, 11929, 11931,
+ 11933, 11938, 11939, 11943, 11944, 11948, 11947, 11957, 11958, 11962,
+ 11962, 11964, 11965, 11969, 11970, 11975, 11974, 11985, 11989, 11993,
+ 12006, 12005, 12019, 12020, 12021, 12024, 12025, 12026, 12030, 12035,
+ 12045, 12057, 12068, 12078, 12088, 12056, 12096, 12097, 12101, 12102,
+ 12106, 12107, 12115, 12119, 12120, 12121, 12124, 12126, 12130, 12131,
+ 12135, 12140, 12147, 12152, 12159, 12161, 12165, 12166, 12170, 12175,
+ 12183, 12184, 12187, 12189, 12197, 12199, 12203, 12204, 12205, 12209,
+ 12211, 12216, 12217, 12226, 12227, 12231, 12232, 12236, 12249, 12272,
+ 12284, 12295, 12314, 12322, 12334, 12342, 12357, 12377, 12378, 12379,
+ 12387, 12388, 12389, 12396, 12402, 12408, 12414, 12420, 12426, 12455,
+ 12483, 12484, 12485, 12489, 12499, 12509, 12515, 12524, 12539, 12540,
+ 12544, 12553, 12568, 12572, 12618, 12622, 12639, 12643, 12721, 12745,
+ 12775, 12776, 12792, 12802, 12806, 12812, 12818, 12828, 12834, 12843,
+ 12853, 12854, 12882, 12896, 12910, 12925, 12926, 12936, 12937, 12947,
+ 12948, 12949, 12953, 12969, 12990, 13005, 13006, 13007, 13008, 13009,
+ 13010, 13011, 13012, 13013, 13014, 13015, 13016, 13017, 13018, 13019,
+ 13020, 13021, 13022, 13023, 13024, 13025, 13026, 13027, 13028, 13029,
+ 13030, 13031, 13032, 13033, 13034, 13035, 13036, 13037, 13038, 13039,
+ 13040, 13041, 13042, 13043, 13044, 13045, 13046, 13047, 13048, 13049,
+ 13050, 13051, 13052, 13053, 13054, 13055, 13056, 13057, 13058, 13059,
+ 13060, 13061, 13062, 13063, 13073, 13074, 13075, 13076, 13077, 13078,
+ 13079, 13080, 13081, 13082, 13083, 13084, 13085, 13086, 13087, 13088,
+ 13089, 13090, 13091, 13092, 13093, 13094, 13095, 13096, 13097, 13098,
+ 13099, 13100, 13101, 13102, 13103, 13104, 13105, 13106, 13107, 13108,
+ 13109, 13110, 13111, 13112, 13113, 13114, 13115, 13116, 13117, 13118,
+ 13119, 13120, 13121, 13122, 13123, 13124, 13125, 13126, 13127, 13128,
+ 13129, 13130, 13131, 13132, 13133, 13134, 13135, 13136, 13137, 13138,
+ 13139, 13140, 13141, 13142, 13143, 13144, 13145, 13146, 13147, 13148,
+ 13149, 13150, 13151, 13152, 13153, 13154, 13155, 13156, 13157, 13158,
+ 13159, 13160, 13161, 13162, 13163, 13164, 13165, 13166, 13167, 13168,
+ 13169, 13170, 13171, 13172, 13173, 13174, 13175, 13176, 13177, 13178,
+ 13179, 13180, 13181, 13182, 13183, 13184, 13185, 13186, 13187, 13188,
+ 13189, 13190, 13191, 13192, 13193, 13194, 13195, 13196, 13197, 13198,
+ 13199, 13200, 13201, 13202, 13203, 13204, 13205, 13206, 13207, 13208,
+ 13209, 13210, 13211, 13212, 13213, 13214, 13215, 13216, 13217, 13218,
+ 13219, 13220, 13221, 13222, 13223, 13224, 13225, 13226, 13227, 13228,
+ 13229, 13230, 13231, 13232, 13233, 13234, 13235, 13236, 13237, 13238,
+ 13239, 13240, 13241, 13242, 13243, 13244, 13245, 13246, 13247, 13248,
+ 13249, 13250, 13251, 13252, 13253, 13254, 13255, 13256, 13257, 13258,
+ 13259, 13260, 13261, 13262, 13263, 13264, 13265, 13266, 13267, 13268,
+ 13269, 13270, 13271, 13272, 13273, 13274, 13275, 13276, 13277, 13278,
+ 13279, 13280, 13281, 13282, 13283, 13284, 13285, 13286, 13287, 13288,
+ 13289, 13290, 13291, 13292, 13293, 13294, 13295, 13296, 13297, 13298,
+ 13299, 13300, 13301, 13302, 13303, 13304, 13305, 13306, 13307, 13308,
+ 13309, 13310, 13311, 13312, 13313, 13314, 13315, 13316, 13317, 13318,
+ 13319, 13320, 13321, 13322, 13323, 13324, 13325, 13326, 13327, 13328,
+ 13329, 13330, 13331, 13332, 13333, 13334, 13335, 13336, 13337, 13338,
+ 13339, 13340, 13341, 13342, 13343, 13344, 13345, 13346, 13347, 13348,
+ 13349, 13350, 13351, 13352, 13353, 13354, 13355, 13356, 13357, 13358,
+ 13359, 13360, 13361, 13362, 13363, 13364, 13365, 13372, 13371, 13386,
+ 13387, 13391, 13392, 13396, 13396, 13476, 13477, 13478, 13479, 13483,
+ 13484, 13488, 13489, 13490, 13491, 13495, 13496, 13497, 13498, 13502,
+ 13503, 13507, 13548, 13566, 13577, 13589, 13602, 13617, 13636, 13662,
+ 13675, 13701, 13744, 13758, 13759, 13760, 13761, 13765, 13766, 13775,
+ 13787, 13788, 13789, 13795, 13801, 13813, 13812, 13828, 13829, 13833,
+ 13834, 13838, 13853, 13854, 13855, 13860, 13861, 13866, 13865, 13885,
+ 13897, 13910, 13909, 13943, 13944, 13948, 13949, 13953, 13954, 13955,
+ 13956, 13958, 13957, 13970, 13971, 13972, 13973, 13974, 13980, 13985,
+ 13991, 14002, 14013, 14017, 14027, 14032, 14039, 14051, 14063, 14072,
+ 14074, 14078, 14079, 14086, 14088, 14092, 14093, 14098, 14097, 14101,
+ 14100, 14104, 14103, 14107, 14106, 14109, 14110, 14111, 14112, 14113,
+ 14114, 14115, 14116, 14117, 14118, 14119, 14120, 14121, 14122, 14123,
+ 14124, 14125, 14126, 14127, 14128, 14129, 14130, 14131, 14132, 14133,
+ 14134, 14138, 14139, 14143, 14144, 14148, 14158, 14168, 14181, 14196,
+ 14209, 14222, 14234, 14239, 14247, 14252, 14259, 14259, 14260, 14260,
+ 14263, 14290, 14295, 14301, 14307, 14313, 14317, 14321, 14322, 14326,
+ 14353, 14355, 14359, 14363, 14367, 14374, 14375, 14379, 14380, 14384,
+ 14385, 14389, 14390, 14396, 14402, 14408, 14418, 14417, 14427, 14428,
+ 14433, 14434, 14435, 14440, 14441, 14442, 14446, 14447, 14451, 14463,
+ 14472, 14482, 14491, 14505, 14506, 14511, 14510, 14526, 14527, 14528,
+ 14532, 14533, 14537, 14537, 14559, 14560, 14564, 14565, 14566, 14570,
+ 14574, 14581, 14584, 14582, 14598, 14605, 14626, 14650, 14652, 14656,
+ 14657, 14661, 14662, 14670, 14671, 14672, 14673, 14679, 14685, 14695,
+ 14697, 14699, 14704, 14705, 14706, 14707, 14708, 14712, 14713, 14714,
+ 14715, 14716, 14717, 14727, 14728, 14733, 14746, 14759, 14761, 14763,
+ 14768, 14773, 14775, 14777, 14783, 14784, 14786, 14792, 14791, 14808,
+ 14809, 14813, 14818, 14826, 14826, 14850, 14851, 14856, 14857, 14859,
+ 14861, 14879, 14885, 14890, 14872, 14951, 14968, 14992, 15023, 15027,
+ 15036, 15059, 14988, 15122, 15146, 15155, 15162, 15121, 15182, 15186,
+ 15190, 15194, 15198, 15202, 15209, 15216, 15223, 15233, 15234, 15238,
+ 15239, 15240, 15244, 15245, 15250, 15252, 15251, 15257, 15258, 15262,
+ 15269, 15279, 15285, 15296
};
#endif
@@ -20052,15 +20052,11 @@ yyreduce:
switch (end_ptr[0])
{
case 'g':
- case 'G':
- text_shift_number+=10;
+ case 'G': text_shift_number+=30; break;
case 'm':
- case 'M':
- text_shift_number+=10;
+ case 'M': text_shift_number+=20; break;
case 'k':
- case 'K':
- text_shift_number+=10;
- break;
+ case 'K': text_shift_number+=10; break;
default:
{
my_error(ER_WRONG_SIZE_NUMBER, MYF(0));
@@ -20081,23 +20077,23 @@ yyreduce:
}
(yyval.ulonglong_number)= number;
}
-#line 20085 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20081 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 425:
-#line 4251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4247 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20091 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20087 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 426:
-#line 4254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20097 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20093 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 427:
-#line 4256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
TABLE_LIST *src_table;
LEX *lex= thd->lex;
@@ -20111,11 +20107,11 @@ yyreduce:
/* CREATE TABLE ... LIKE is not allowed for views. */
src_table->required_type= FRMTYPE_TABLE;
}
-#line 20115 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20111 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 428:
-#line 4270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4266 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
TABLE_LIST *src_table;
LEX *lex= thd->lex;
@@ -20129,67 +20125,67 @@ yyreduce:
/* CREATE TABLE ... LIKE is not allowed for views. */
src_table->required_type= FRMTYPE_TABLE;
}
-#line 20133 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20129 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 429:
-#line 4287 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.option_list= NULL;
}
-#line 20141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 430:
-#line 4292 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4288 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20147 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20143 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 431:
-#line 4295 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4291 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->set_braces(1);}
-#line 20153 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20149 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 432:
-#line 4296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4292 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20159 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20155 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 433:
-#line 4300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20165 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20161 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 434:
-#line 4302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->set_braces(0);}
-#line 20171 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20167 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 435:
-#line 4303 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4299 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20177 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20173 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 436:
-#line 4305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->set_braces(1);}
-#line 20183 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20179 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 437:
-#line 4306 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20189 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20185 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 438:
-#line 4311 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4307 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Remove all tables used in PARTITION clause from the global table
@@ -20199,17 +20195,17 @@ yyreduce:
last_non_sel_table->next_global= 0;
Lex->query_tables_last= &last_non_sel_table->next_global;
}
-#line 20203 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20199 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 439:
-#line 4347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20209 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20205 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 441:
-#line 4353 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->part_info= new partition_info();
@@ -20223,11 +20219,11 @@ yyreduce:
lex->alter_info.flags|= ALTER_PARTITION;
}
}
-#line 20227 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20223 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 443:
-#line 4371 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4367 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
#ifdef WITH_PARTITION_STORAGE_ENGINE
LEX_STRING partition_name={C_STRING_WITH_LEN("partition")};
@@ -20243,11 +20239,11 @@ yyreduce:
MYSQL_YYABORT;
#endif
}
-#line 20247 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20243 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 444:
-#line 4390 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4386 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (!lex->part_info)
@@ -20260,82 +20256,82 @@ yyreduce:
partition info string into part_info data structure.
*/
}
-#line 20264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20260 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 445:
-#line 4402 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4398 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20266 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 447:
-#line 4411 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4407 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->list_of_part_fields= TRUE;
part_info->column_list= FALSE;
part_info->part_type= HASH_PARTITION;
}
-#line 20281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20277 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 448:
-#line 4418 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4414 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->part_type= HASH_PARTITION; }
-#line 20287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20283 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 449:
-#line 4419 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4415 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20293 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20289 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 450:
-#line 4421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->part_type= RANGE_PARTITION; }
-#line 20299 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20295 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 451:
-#line 4423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4419 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->part_type= RANGE_PARTITION; }
-#line 20305 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20301 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 452:
-#line 4425 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->part_type= LIST_PARTITION; }
-#line 20311 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20307 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 453:
-#line 4427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->part_type= LIST_PARTITION; }
-#line 20317 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20313 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 454:
-#line 4431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20323 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20319 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 455:
-#line 4433 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4429 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->linear_hash_ind= TRUE;}
-#line 20329 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20325 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 456:
-#line 4438 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4434 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->key_algorithm= partition_info::KEY_ALGORITHM_NONE;}
-#line 20335 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20331 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 457:
-#line 4440 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4436 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
switch ((yyvsp[0].ulong_num)) {
case 1:
@@ -20349,35 +20345,35 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20349 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 458:
-#line 4456 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4452 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20359 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20355 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 459:
-#line 4457 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4453 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20361 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 460:
-#line 4461 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4457 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20367 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 461:
-#line 4462 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4458 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20373 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 462:
-#line 4467 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4463 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->num_columns++;
@@ -20393,21 +20389,21 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 463:
-#line 4486 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4482 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->column_list= TRUE;
part_info->list_of_part_fields= TRUE;
}
-#line 20407 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20403 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 464:
-#line 4496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->set_part_expr((yyvsp[-3].simple_string)+1, (yyvsp[-2].item), (yyvsp[-1].simple_string), FALSE))
@@ -20415,26 +20411,26 @@ yyreduce:
part_info->num_columns= 1;
part_info->column_list= FALSE;
}
-#line 20419 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20415 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 465:
-#line 4507 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4503 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->part_info->set_part_expr((yyvsp[-3].simple_string)+1, (yyvsp[-2].item), (yyvsp[-1].simple_string), TRUE))
{ MYSQL_YYABORT; }
}
-#line 20428 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20424 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 466:
-#line 4515 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4511 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20434 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20430 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 467:
-#line 4517 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4513 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
uint num_parts= (yyvsp[0].ulong_num);
partition_info *part_info= Lex->part_info;
@@ -20447,57 +20443,57 @@ yyreduce:
part_info->num_parts= num_parts;
part_info->use_default_num_partitions= FALSE;
}
-#line 20451 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 468:
-#line 4532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20457 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 469:
-#line 4534 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4530 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->subpart_type= HASH_PARTITION; }
-#line 20463 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20459 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 470:
-#line 4535 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4531 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20469 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20465 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 471:
-#line 4538 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4534 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->subpart_type= HASH_PARTITION;
part_info->list_of_subpart_fields= TRUE;
}
-#line 20479 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20475 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 472:
-#line 4543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4539 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20481 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 473:
-#line 4547 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20487 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 474:
-#line 4548 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4544 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20493 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 475:
-#line 4553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->subpart_field_list.push_back((yyvsp[0].lex_str).str))
@@ -20512,11 +20508,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 476:
-#line 4571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4567 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
bool not_corr_func;
@@ -20529,17 +20525,17 @@ yyreduce:
}
(yyval.item)=(yyvsp[0].item);
}
-#line 20533 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20529 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 477:
-#line 4586 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4582 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20539 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20535 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 478:
-#line 4588 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4584 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
uint num_parts= (yyvsp[0].ulong_num);
LEX *lex= Lex;
@@ -20551,11 +20547,11 @@ yyreduce:
lex->part_info->num_subparts= num_parts;
lex->part_info->use_default_num_subpartitions= FALSE;
}
-#line 20555 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20551 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 479:
-#line 4603 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4599 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->part_type == RANGE_PARTITION)
@@ -20571,11 +20567,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20575 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20571 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 480:
-#line 4619 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4615 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
uint count_curr_parts= part_info->partitions.elements;
@@ -20594,23 +20590,23 @@ yyreduce:
}
part_info->count_curr_subparts= 0;
}
-#line 20598 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 481:
-#line 4640 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4636 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 482:
-#line 4641 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4637 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 483:
-#line 4646 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4642 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
partition_element *p_elem= new partition_element();
@@ -20626,17 +20622,17 @@ yyreduce:
part_info->use_default_partitions= FALSE;
part_info->use_default_num_partitions= FALSE;
}
-#line 20630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 484:
-#line 4665 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4661 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20636 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 485:
-#line 4670 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4666 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
partition_element *p_elem= part_info->curr_part_elem;
@@ -20644,11 +20640,11 @@ yyreduce:
MYSQL_YYABORT;
p_elem->partition_name= (yyvsp[0].lex_str).str;
}
-#line 20648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 486:
-#line 4681 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4677 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
partition_info *part_info= lex->part_info;
@@ -20670,11 +20666,11 @@ yyreduce:
else
part_info->part_type= HASH_PARTITION;
}
-#line 20674 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 487:
-#line 4703 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4699 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
partition_info *part_info= lex->part_info;
@@ -20690,17 +20686,17 @@ yyreduce:
else
part_info->part_type= RANGE_PARTITION;
}
-#line 20694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 488:
-#line 4718 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4714 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20700 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20696 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 489:
-#line 4720 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4716 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
partition_info *part_info= lex->part_info;
@@ -20716,17 +20712,17 @@ yyreduce:
else
part_info->part_type= LIST_PARTITION;
}
-#line 20720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 490:
-#line 4735 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4731 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20722 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 491:
-#line 4740 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4736 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
@@ -20748,17 +20744,17 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20752 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 492:
-#line 4761 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4757 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20758 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20754 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 493:
-#line 4766 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
partition_info *part_info= lex->part_info;
@@ -20787,11 +20783,11 @@ yyreduce:
}
}
}
-#line 20791 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20787 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 494:
-#line 4795 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4791 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->num_columns < 2U)
@@ -20800,23 +20796,23 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20804 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 495:
-#line 4806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 496:
-#line 4807 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4803 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20816 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20812 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 497:
-#line 4812 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4808 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->print_debug("( part_value_item", NULL);
@@ -20828,17 +20824,17 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 498:
-#line 4823 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4819 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 499:
-#line 4825 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4821 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->print_debug(") part_value_item", NULL);
@@ -20859,23 +20855,23 @@ yyreduce:
}
part_info->curr_list_object= 0;
}
-#line 20863 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20859 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 500:
-#line 4848 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4844 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20869 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20865 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 501:
-#line 4849 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4845 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20875 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20871 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 502:
-#line 4854 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4850 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->part_type == LIST_PARTITION)
@@ -20888,11 +20884,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20892 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20888 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 503:
-#line 4867 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4863 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
partition_info *part_info= lex->part_info;
@@ -20908,11 +20904,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20912 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20908 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 504:
-#line 4887 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4883 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->num_subparts != 0 &&
@@ -20926,11 +20922,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 20930 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20926 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 505:
-#line 4901 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4897 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
if (part_info->num_subparts != 0)
@@ -20953,23 +20949,23 @@ yyreduce:
}
part_info->count_curr_subparts= 0;
}
-#line 20957 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20953 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 506:
-#line 4926 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4922 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20963 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20959 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 507:
-#line 4927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4923 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 20969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 20965 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 508:
-#line 4932 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4928 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
partition_element *curr_part= part_info->current_partition;
@@ -21002,113 +20998,113 @@ yyreduce:
part_info->use_default_num_subpartitions= FALSE;
part_info->count_curr_subparts++;
}
-#line 21006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 509:
-#line 4964 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4960 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 510:
-#line 4969 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4965 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (check_ident_length(&(yyvsp[0].lex_str)))
MYSQL_YYABORT;
Lex->part_info->curr_part_elem->partition_name= (yyvsp[0].lex_str).str;
}
-#line 21022 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 511:
-#line 4977 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4973 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21028 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 512:
-#line 4978 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 513:
-#line 4982 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4978 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21040 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21036 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 514:
-#line 4983 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4979 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21046 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 515:
-#line 4988 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4984 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->tablespace_name= (yyvsp[0].lex_str).str; }
-#line 21052 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 516:
-#line 4990 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4986 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->curr_part_elem->engine_type= (yyvsp[0].db_type);
part_info->default_engine_type= (yyvsp[0].db_type);
}
-#line 21062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 517:
-#line 4996 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4992 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->part_info->curr_part_elem->connect_string.str= (yyvsp[0].lex_str).str;
lex->part_info->curr_part_elem->connect_string.length= (yyvsp[0].lex_str).length;
}
-#line 21072 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21068 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 518:
-#line 5002 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 4998 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->nodegroup_id= (uint16) (yyvsp[0].ulong_num); }
-#line 21078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 519:
-#line 5004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5000 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->part_max_rows= (ha_rows) (yyvsp[0].ulonglong_number); }
-#line 21084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21080 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 520:
-#line 5006 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5002 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->part_min_rows= (ha_rows) (yyvsp[0].ulonglong_number); }
-#line 21090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21086 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 521:
-#line 5008 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->data_file_name= (yyvsp[0].lex_str).str; }
-#line 21096 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21092 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 522:
-#line 5010 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5006 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->index_file_name= (yyvsp[0].lex_str).str; }
-#line 21102 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21098 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 523:
-#line 5012 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5008 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->part_info->curr_part_elem->part_comment= (yyvsp[0].lex_str).str; }
-#line 21108 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21104 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 524:
-#line 5021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->sql_command == SQLCOM_INSERT)
@@ -21123,19 +21119,19 @@ yyreduce:
mysql_init_select(lex);
lex->current_select->parsing_place= SELECT_LIST;
}
-#line 21127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21123 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 525:
-#line 5036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 21135 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 526:
-#line 5040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
The following work only with the local list, the global list
@@ -21143,164 +21139,164 @@ yyreduce:
*/
Lex->current_select->table_list.push_front(&Lex->save_list);
}
-#line 21147 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21143 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 527:
-#line 5050 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5046 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21153 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21149 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 528:
-#line 5051 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5047 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21159 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21155 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 529:
-#line 5055 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5051 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21165 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21161 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 530:
-#line 5056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5052 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21171 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21167 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 531:
-#line 5060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21177 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21173 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 532:
-#line 5061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21183 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21179 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 533:
-#line 5065 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21189 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21185 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 534:
-#line 5066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5062 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21195 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21191 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 535:
-#line 5070 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 21201 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21197 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 536:
-#line 5071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5067 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (yyvsp[0].num);}
-#line 21207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21203 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 537:
-#line 5075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=(yyvsp[0].num); }
-#line 21213 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21209 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 538:
-#line 5076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5072 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (yyvsp[-1].num) | (yyvsp[0].num); }
-#line 21219 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21215 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 539:
-#line 5080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=HA_LEX_CREATE_TMP_TABLE; }
-#line 21225 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 540:
-#line 5084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 21231 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21227 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 541:
-#line 5085 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=HA_LEX_CREATE_IF_NOT_EXISTS; }
-#line 21237 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21233 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 549:
-#line 5106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.db_type= (yyvsp[0].db_type);
Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
}
-#line 21246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21242 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 550:
-#line 5111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.max_rows= (yyvsp[0].ulonglong_number);
Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;
}
-#line 21255 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21251 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 551:
-#line 5116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.min_rows= (yyvsp[0].ulonglong_number);
Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;
}
-#line 21264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21260 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 552:
-#line 5121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.avg_row_length=(yyvsp[0].ulong_num);
Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;
}
-#line 21273 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21269 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 553:
-#line 5126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.password=(yyvsp[0].lex_str).str;
Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD;
}
-#line 21282 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21278 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 554:
-#line 5131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.comment=(yyvsp[0].lex_str);
Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
}
-#line 21291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 555:
-#line 5136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.auto_increment_value=(yyvsp[0].ulonglong_number);
Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;
}
-#line 21300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21296 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 556:
-#line 5141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
switch((yyvsp[0].ulong_num)) {
case 0:
@@ -21315,74 +21311,74 @@ yyreduce:
}
Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;
}
-#line 21319 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21315 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 557:
-#line 5156 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.table_options&=
~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS);
Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;
}
-#line 21329 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21325 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 558:
-#line 5162 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5158 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.table_options|= (yyvsp[0].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
}
-#line 21338 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21334 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 559:
-#line 5167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.table_options|= (yyvsp[0].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
}
-#line 21347 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21343 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 560:
-#line 5172 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5168 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.used_fields|= HA_CREATE_USED_PAGE_CHECKSUM;
Lex->create_info.page_checksum= (yyvsp[0].choice);
}
-#line 21356 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21352 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 561:
-#line 5177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.table_options|= (yyvsp[0].ulong_num) ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE;
Lex->create_info.used_fields|= HA_CREATE_USED_DELAY_KEY_WRITE;
}
-#line 21365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21361 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 562:
-#line 5182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.row_type= (yyvsp[0].row_type);
Lex->create_info.used_fields|= HA_CREATE_USED_ROW_FORMAT;
}
-#line 21374 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21370 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 563:
-#line 5187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->select_lex.table_list.save_and_clear(&Lex->save_list);
}
-#line 21382 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21378 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 564:
-#line 5191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Move the union list to the merge_list and exclude its tables
@@ -21404,124 +21400,124 @@ yyreduce:
lex->create_info.used_fields|= HA_CREATE_USED_UNION;
}
-#line 21408 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21404 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 567:
-#line 5215 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5211 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.merge_insert_method= (yyvsp[0].ulong_num);
Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;
}
-#line 21417 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21413 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 568:
-#line 5220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.data_file_name= (yyvsp[0].lex_str).str;
Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR;
}
-#line 21426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21422 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 569:
-#line 5225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.index_file_name= (yyvsp[0].lex_str).str;
Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR;
}
-#line 21435 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 570:
-#line 5230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{Lex->create_info.tablespace= (yyvsp[0].lex_str).str;}
-#line 21441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 571:
-#line 5232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{Lex->create_info.storage_media= HA_SM_DISK;}
-#line 21447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21443 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 572:
-#line 5234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{Lex->create_info.storage_media= HA_SM_MEMORY;}
-#line 21453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21449 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 573:
-#line 5236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.connect_string.str= (yyvsp[0].lex_str).str;
Lex->create_info.connect_string.length= (yyvsp[0].lex_str).length;
Lex->create_info.used_fields|= HA_CREATE_USED_CONNECTION;
}
-#line 21463 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21459 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 574:
-#line 5242 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE;
Lex->create_info.key_block_size= (yyvsp[0].ulong_num);
}
-#line 21472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21468 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 575:
-#line 5247 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5243 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.used_fields|= HA_CREATE_USED_TRANSACTIONAL;
Lex->create_info.transactional= (yyvsp[0].choice);
}
-#line 21481 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 576:
-#line 5252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), true, &Lex->create_info.option_list,
&Lex->option_list_last);
}
-#line 21491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21487 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 577:
-#line 5258 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), false, &Lex->create_info.option_list,
&Lex->option_list_last);
}
-#line 21501 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 578:
-#line 5264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].ulonglong_number), &Lex->create_info.option_list,
&Lex->option_list_last, thd->mem_root);
}
-#line 21511 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21507 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 579:
-#line 5270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5266 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), &Lex->create_info.option_list,
&Lex->option_list_last);
}
-#line 21521 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21517 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 580:
-#line 5279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
HA_CREATE_INFO *cinfo= &Lex->create_info;
if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -21536,11 +21532,11 @@ yyreduce:
Lex->create_info.default_table_charset= (yyvsp[0].charset);
Lex->create_info.used_fields|= HA_CREATE_USED_DEFAULT_CHARSET;
}
-#line 21540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 581:
-#line 5297 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5293 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
HA_CREATE_INFO *cinfo= &Lex->create_info;
if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -21554,11 +21550,11 @@ yyreduce:
Lex->create_info.default_table_charset= (yyvsp[0].charset);
Lex->create_info.used_fields|= HA_CREATE_USED_DEFAULT_CHARSET;
}
-#line 21558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21554 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 582:
-#line 5314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5310 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
plugin_ref plugin= ha_resolve_by_name(thd, &(yyvsp[0].lex_str));
@@ -21578,11 +21574,11 @@ yyreduce:
(yyvsp[0].lex_str).str);
}
}
-#line 21582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 583:
-#line 5337 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5333 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
plugin_ref plugin;
if ((plugin= ha_resolve_by_name(thd, &(yyvsp[0].lex_str))))
@@ -21593,177 +21589,177 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 21597 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21593 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 584:
-#line 5350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_DEFAULT; }
-#line 21603 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21599 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 585:
-#line 5351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_FIXED; }
-#line 21609 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21605 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 586:
-#line 5352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5348 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_DYNAMIC; }
-#line 21615 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21611 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 587:
-#line 5353 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_COMPRESSED; }
-#line 21621 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21617 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 588:
-#line 5354 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_REDUNDANT; }
-#line 21627 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21623 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 589:
-#line 5355 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_COMPACT; }
-#line 21633 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21629 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 590:
-#line 5356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.row_type)= ROW_TYPE_PAGE; }
-#line 21639 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21635 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 591:
-#line 5360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulong_num)= MERGE_INSERT_DISABLED; }
-#line 21645 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21641 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 592:
-#line 5361 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5357 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; }
-#line 21651 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21647 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 593:
-#line 5362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulong_num)= MERGE_INSERT_TO_LAST; }
-#line 21657 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21653 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 594:
-#line 5366 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21659 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 596:
-#line 5371 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5367 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num) = (int) STRING_RESULT; }
-#line 21669 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21665 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 597:
-#line 5372 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5368 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num) = (int) REAL_RESULT; }
-#line 21675 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21671 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 598:
-#line 5373 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num) = (int) DECIMAL_RESULT; }
-#line 21681 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21677 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 599:
-#line 5374 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5370 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num) = (int) INT_RESULT; }
-#line 21687 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21683 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 600:
-#line 5380 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5376 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_last_non_select_table= Lex->last_table();
}
-#line 21695 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21691 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 606:
-#line 5398 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5394 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->col_list.empty(); /* Alloced by sql_alloc */
}
-#line 21703 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21699 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 607:
-#line 5405 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5401 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->option_list= NULL; }
-#line 21709 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21705 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 608:
-#line 5407 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_create_index (Lex, (yyvsp[-7].key_type), (yyvsp[-6].lex_str)))
MYSQL_YYABORT;
}
-#line 21718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 609:
-#line 5413 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5409 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->option_list= NULL; }
-#line 21724 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 610:
-#line 5415 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5411 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_create_index (Lex, (yyvsp[-8].key_type), (yyvsp[-6].lex_str)))
MYSQL_YYABORT;
}
-#line 21733 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 611:
-#line 5421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->option_list= NULL; }
-#line 21739 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21735 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 612:
-#line 5423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5419 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_create_index (Lex, (yyvsp[-8].key_type), (yyvsp[-6].lex_str)))
MYSQL_YYABORT;
}
-#line 21748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 613:
-#line 5429 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5425 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->option_list= NULL; }
-#line 21754 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 614:
-#line 5431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_create_index (Lex, (yyvsp[-7].key_type), (yyvsp[-6].lex_str).str ? (yyvsp[-6].lex_str) : (yyvsp[-8].lex_str)))
MYSQL_YYABORT;
}
-#line 21763 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 615:
-#line 5436 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5432 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Key *key= new Foreign_key((yyvsp[-4].lex_str).str ? (yyvsp[-4].lex_str) : (yyvsp[-7].lex_str), lex->col_list,
@@ -21782,37 +21778,37 @@ yyreduce:
/* Only used for ALTER TABLE. Ignored otherwise. */
lex->alter_info.flags|= ALTER_FOREIGN_KEY;
}
-#line 21786 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 616:
-#line 5455 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5451 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->col_list.empty(); /* Alloced by sql_alloc */
}
-#line 21794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21790 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 620:
-#line 5470 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5466 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= null_lex_str; }
-#line 21800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 621:
-#line 5471 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5467 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 21806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21802 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 622:
-#line 5475 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5471 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 21812 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21808 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 623:
-#line 5480 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5476 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->length=lex->dec=0;
@@ -21823,11 +21819,11 @@ yyreduce:
lex->vcol_info= 0;
lex->option_list= NULL;
}
-#line 21827 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21823 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 624:
-#line 5491 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5487 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (add_field_to_list(lex->thd, &(yyvsp[-2].lex_str), (yyvsp[0].lex_type).type,
@@ -21839,107 +21835,107 @@ yyreduce:
lex->vcol_info, lex->option_list))
MYSQL_YYABORT;
}
-#line 21843 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21839 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 625:
-#line 5506 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5502 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_type).set((yyvsp[-1].num), Lex->length, Lex->dec, Lex->charset); }
-#line 21849 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21845 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 626:
-#line 5508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_type).set((yyvsp[-2].num), Lex->length, Lex->dec, Lex->charset); }
-#line 21855 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21851 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 627:
-#line 5510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5506 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_type)= (yyvsp[-5].lex_type);
Lex->vcol_info->set_field_type((yyval.lex_type).type);
(yyval.lex_type).type= (enum enum_field_types)MYSQL_TYPE_VIRTUAL;
}
-#line 21865 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21861 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 629:
-#line 5519 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5515 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21871 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21867 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 630:
-#line 5524 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5520 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->vcol_info->set_stored_in_db_flag(FALSE);
}
-#line 21879 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21875 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 631:
-#line 5528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5524 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->vcol_info->set_stored_in_db_flag(FALSE);
}
-#line 21887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 632:
-#line 5532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->vcol_info->set_stored_in_db_flag(TRUE);
}
-#line 21895 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21891 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 633:
-#line 5538 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5534 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 634:
-#line 5539 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5535 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21907 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21903 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 635:
-#line 5543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5539 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 21913 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21909 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 637:
-#line 5549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5545 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= UNIQUE_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 21923 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21919 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 638:
-#line 5555 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5551 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= UNIQUE_KEY_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 21933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21929 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 639:
-#line 5560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5556 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->comment= (yyvsp[0].lex_str); }
-#line 21939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21935 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 640:
-#line 5565 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5561 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
"PARSE_VCOL_EXPR" can only be used by the SQL server
@@ -21952,11 +21948,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 21956 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21952 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 641:
-#line 5581 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->vcol_info= new Virtual_column_info();
if (!Lex->vcol_info)
@@ -21969,145 +21965,145 @@ yyreduce:
Lex->vcol_info->expr_str.length= expr_len;
Lex->vcol_info->expr_item= (yyvsp[-1].item);
}
-#line 21973 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 642:
-#line 5596 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5592 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=(yyvsp[-2].num); }
-#line 21979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 643:
-#line 5597 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5593 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=(yyvsp[-2].num); }
-#line 21985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21981 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 644:
-#line 5598 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5594 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_FLOAT; }
-#line 21991 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21987 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 645:
-#line 5600 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5596 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
(yyval.num)=MYSQL_TYPE_BIT;
}
-#line 22000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 21996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 646:
-#line 5605 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5601 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)=MYSQL_TYPE_BIT;
}
-#line 22008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 647:
-#line 5609 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5605 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
(yyval.num)=MYSQL_TYPE_TINY;
}
-#line 22017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22013 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 648:
-#line 5614 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5610 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
(yyval.num)=MYSQL_TYPE_TINY;
}
-#line 22026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22022 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 649:
-#line 5619 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5615 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)=MYSQL_TYPE_STRING;
}
-#line 22034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 650:
-#line 5623 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5619 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
(yyval.num)=MYSQL_TYPE_STRING;
}
-#line 22043 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22039 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 651:
-#line 5628 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5624 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)=MYSQL_TYPE_STRING;
Lex->charset=national_charset_info;
}
-#line 22052 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 652:
-#line 5633 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5629 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
(yyval.num)=MYSQL_TYPE_STRING;
Lex->charset=national_charset_info;
}
-#line 22062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 653:
-#line 5639 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5635 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_STRING;
}
-#line 22071 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22067 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 654:
-#line 5644 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5640 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= (char*) "1";
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_STRING;
}
-#line 22081 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22077 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 655:
-#line 5650 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5646 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= MYSQL_TYPE_VARCHAR;
}
-#line 22089 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22085 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 656:
-#line 5654 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5650 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= MYSQL_TYPE_VARCHAR;
Lex->charset=national_charset_info;
}
-#line 22098 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22094 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 657:
-#line 5659 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5655 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)= MYSQL_TYPE_VARCHAR;
}
-#line 22107 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22103 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 658:
-#line 5664 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5660 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->length)
{
@@ -22125,23 +22121,23 @@ yyreduce:
}
(yyval.num)=MYSQL_TYPE_YEAR;
}
-#line 22129 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22125 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 659:
-#line 5682 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5678 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_DATE; }
-#line 22135 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 660:
-#line 5684 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_TIME; }
-#line 22141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 661:
-#line 5686 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5682 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (thd->variables.sql_mode & MODE_MAXDB)
(yyval.num)=MYSQL_TYPE_DATETIME;
@@ -22154,35 +22150,35 @@ yyreduce:
(yyval.num)=MYSQL_TYPE_TIMESTAMP;
}
}
-#line 22158 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22154 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 662:
-#line 5699 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5695 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_DATETIME; }
-#line 22164 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22160 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 663:
-#line 5701 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5697 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_TINY_BLOB;
}
-#line 22173 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22169 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 664:
-#line 5706 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5702 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_BLOB;
}
-#line 22182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22178 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 665:
-#line 5711 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5707 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
#ifdef HAVE_SPATIAL
Lex->charset=&my_charset_bin;
@@ -22194,506 +22190,506 @@ yyreduce:
MYSQL_YYABORT;
#endif
}
-#line 22198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 666:
-#line 5723 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
}
-#line 22207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22203 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 667:
-#line 5728 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5724 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_LONG_BLOB;
}
-#line 22216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 668:
-#line 5733 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5729 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset=&my_charset_bin;
(yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
}
-#line 22225 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 669:
-#line 5738 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5734 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
-#line 22231 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22227 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 670:
-#line 5740 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5736 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_TINY_BLOB; }
-#line 22237 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22233 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 671:
-#line 5742 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5738 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_BLOB; }
-#line 22243 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22239 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 672:
-#line 5744 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5740 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
-#line 22249 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22245 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 673:
-#line 5746 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5742 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_LONG_BLOB; }
-#line 22255 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22251 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 674:
-#line 5748 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5744 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
-#line 22261 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22257 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 675:
-#line 5750 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5746 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
-#line 22267 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22263 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 676:
-#line 5752 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5748 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
-#line 22273 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22269 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 677:
-#line 5754 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5750 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{Lex->interval_list.empty();}
-#line 22279 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22275 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 678:
-#line 5756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5752 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_ENUM; }
-#line 22285 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 679:
-#line 5758 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5754 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->interval_list.empty();}
-#line 22291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 680:
-#line 5760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_SET; }
-#line 22297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22293 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 681:
-#line 5762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5758 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
-#line 22303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22299 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 682:
-#line 5764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)=MYSQL_TYPE_LONGLONG;
Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
UNIQUE_FLAG);
}
-#line 22313 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22309 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 683:
-#line 5772 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5768 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_GEOMETRY; }
-#line 22319 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22315 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 684:
-#line 5773 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_GEOMETRYCOLLECTION; }
-#line 22325 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22321 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 685:
-#line 5775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5771 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->length= const_cast<char*>(STRINGIFY_ARG
(MAX_LEN_GEOM_POINT_FIELD));
(yyval.num)= Field::GEOM_POINT;
}
-#line 22335 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22331 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 686:
-#line 5780 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5776 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_MULTIPOINT; }
-#line 22341 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22337 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 687:
-#line 5781 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5777 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_LINESTRING; }
-#line 22347 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22343 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 688:
-#line 5782 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5778 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_MULTILINESTRING; }
-#line 22353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22349 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 689:
-#line 5783 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_POLYGON; }
-#line 22359 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22355 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 690:
-#line 5784 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5780 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= Field::GEOM_MULTIPOLYGON; }
-#line 22365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22361 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 691:
-#line 5788 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5784 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22367 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 692:
-#line 5792 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5788 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22373 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 693:
-#line 5793 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5789 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22383 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22379 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 694:
-#line 5797 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5793 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22385 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 695:
-#line 5798 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5794 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22395 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22391 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 696:
-#line 5802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5798 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 697:
-#line 5803 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5799 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22407 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22403 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 698:
-#line 5804 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5800 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22413 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22409 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 699:
-#line 5805 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5801 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22419 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22415 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 700:
-#line 5806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 701:
-#line 5810 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_LONG; }
-#line 22431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22427 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 702:
-#line 5811 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5807 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_TINY; }
-#line 22437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22433 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 703:
-#line 5812 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5808 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_SHORT; }
-#line 22443 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22439 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 704:
-#line 5813 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5809 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_INT24; }
-#line 22449 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22445 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 705:
-#line 5814 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5810 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_LONGLONG; }
-#line 22455 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22451 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 706:
-#line 5819 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5815 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ?
MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
}
-#line 22464 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22460 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 707:
-#line 5824 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5820 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_DOUBLE; }
-#line 22470 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22466 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 708:
-#line 5826 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5822 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=MYSQL_TYPE_DOUBLE; }
-#line 22476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 709:
-#line 5831 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5827 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->dec=Lex->length= (char*)0; }
-#line 22482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22478 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 710:
-#line 5833 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5829 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->dec= (char*)0; }
-#line 22488 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22484 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 711:
-#line 5835 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5831 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22494 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22490 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 712:
-#line 5840 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5836 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->length=(yyvsp[-3].lex_str).str;
lex->dec=(yyvsp[-1].lex_str).str;
}
-#line 22504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 713:
-#line 5848 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5844 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 714:
-#line 5849 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5845 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 715:
-#line 5853 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5849 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22518 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 716:
-#line 5854 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5850 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22528 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22524 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 717:
-#line 5858 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5854 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22534 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22530 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 718:
-#line 5859 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5855 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= UNSIGNED_FLAG;}
-#line 22540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 719:
-#line 5860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5856 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; }
-#line 22546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 720:
-#line 5864 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->length= (yyvsp[-1].lex_str).str; }
-#line 22552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22548 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 721:
-#line 5865 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5861 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->length= (yyvsp[-1].lex_str).str; }
-#line 22558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22554 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 722:
-#line 5866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->length= (yyvsp[-1].lex_str).str; }
-#line 22564 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22560 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 723:
-#line 5867 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5863 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->length= (yyvsp[-1].lex_str).str; }
-#line 22570 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22566 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 724:
-#line 5870 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->length=(char*) 0; /* use default length */ }
-#line 22576 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22572 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 725:
-#line 5871 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5867 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 22582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 726:
-#line 5875 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5871 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22588 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22584 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 727:
-#line 5876 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5872 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22590 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 728:
-#line 5880 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5876 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22596 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 729:
-#line 5881 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5877 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22602 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 730:
-#line 5885 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5881 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22612 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 732:
-#line 5890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type&= ~ NOT_NULL_FLAG; }
-#line 22618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 733:
-#line 5891 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5887 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= NOT_NULL_FLAG; }
-#line 22624 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22620 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 734:
-#line 5892 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5888 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->default_value=(yyvsp[0].item); }
-#line 22630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 735:
-#line 5894 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root) Item_func_now_local(6);
if (item == NULL)
MYSQL_YYABORT;
Lex->on_update_value= item;
}
-#line 22641 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22637 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 736:
-#line 5900 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5896 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG; }
-#line 22647 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22643 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 737:
-#line 5902 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5898 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 22657 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22653 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 738:
-#line 5908 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5904 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 22667 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 739:
-#line 5914 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= UNIQUE_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 22677 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22673 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 740:
-#line 5920 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5916 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type|= UNIQUE_KEY_FLAG;
lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 22687 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22683 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 741:
-#line 5925 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5921 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->comment= (yyvsp[0].lex_str); }
-#line 22693 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22689 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 742:
-#line 5927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5923 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->charset && !my_charset_same(Lex->charset,(yyvsp[0].charset)))
{
@@ -22706,50 +22702,50 @@ yyreduce:
Lex->charset=(yyvsp[0].charset);
}
}
-#line 22710 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 743:
-#line 5940 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5936 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), true, &Lex->option_list,
&Lex->option_list_last);
}
-#line 22720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 744:
-#line 5946 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5942 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), false, &Lex->option_list,
&Lex->option_list_last);
}
-#line 22730 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 745:
-#line 5952 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].ulonglong_number), &Lex->option_list,
&Lex->option_list_last, thd->mem_root);
}
-#line 22740 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 746:
-#line 5958 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5954 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), &Lex->option_list, &Lex->option_list_last);
}
-#line 22749 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22745 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 747:
-#line 5967 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5963 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= (yyvsp[-1].num);
@@ -22766,51 +22762,51 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22770 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22766 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 748:
-#line 5988 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5984 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_now_local(6);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 22780 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22776 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 749:
-#line 5994 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5990 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=(yyvsp[0].item); }
-#line 22786 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 750:
-#line 5998 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5994 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 751:
-#line 5999 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5995 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22798 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 752:
-#line 6003 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 5999 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22804 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 753:
-#line 6004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6000 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 754:
-#line 6009 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6005 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.charset)=get_charset_by_csname((yyvsp[0].lex_str).str,MY_CS_PRIMARY,MYF(0))))
{
@@ -22818,41 +22814,41 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22822 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 755:
-#line 6016 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6012 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)= &my_charset_bin; }
-#line 22828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22824 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 756:
-#line 6020 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6016 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=(yyvsp[0].charset); }
-#line 22834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22830 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 757:
-#line 6021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=NULL; }
-#line 22840 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22836 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 758:
-#line 6025 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)= NULL; }
-#line 22846 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22842 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 759:
-#line 6026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)= (yyvsp[0].charset); }
-#line 22852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22848 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 760:
-#line 6031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6027 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.charset)=get_charset_by_csname((yyvsp[0].lex_str).str,MY_CS_PRIMARY,MYF(0))) &&
!((yyval.charset)=get_old_charset_by_name((yyvsp[0].lex_str).str)))
@@ -22861,29 +22857,29 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22865 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22861 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 761:
-#line 6039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)= &my_charset_bin; }
-#line 22871 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22867 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 762:
-#line 6043 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=(yyvsp[0].charset); }
-#line 22877 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22873 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 763:
-#line 6044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=NULL; }
-#line 22883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22879 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 764:
-#line 6049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.charset)=get_charset_by_name((yyvsp[0].lex_str).str,MYF(0))))
{
@@ -22891,69 +22887,69 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22895 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22891 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 765:
-#line 6059 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6055 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=NULL; }
-#line 22901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 766:
-#line 6060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=(yyvsp[0].charset); }
-#line 22907 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22903 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 767:
-#line 6064 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=(yyvsp[0].charset); }
-#line 22913 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22909 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 768:
-#line 6065 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.charset)=NULL; }
-#line 22919 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22915 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 769:
-#line 6069 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6065 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22925 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22921 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 770:
-#line 6070 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 22931 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 771:
-#line 6075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->charset= &my_charset_latin1; }
-#line 22937 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 772:
-#line 6077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6073 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset= &my_charset_latin1_bin;
}
-#line 22945 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22941 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 773:
-#line 6081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset= &my_charset_latin1_bin;
}
-#line 22953 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22949 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 774:
-#line 6088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!(Lex->charset=get_charset_by_csname("ucs2",
MY_CS_PRIMARY,MYF(0))))
@@ -22962,11 +22958,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22966 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22962 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 775:
-#line 6097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6093 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
{
@@ -22974,11 +22970,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22978 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22974 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 776:
-#line 6105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
{
@@ -22986,84 +22982,84 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 22990 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22986 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 777:
-#line 6115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->charset=NULL; }
-#line 22996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22992 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 780:
-#line 6118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->charset=&my_charset_bin; }
-#line 23002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 22998 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 781:
-#line 6119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->charset=(yyvsp[-1].charset); }
-#line 23008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 782:
-#line 6121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset= NULL;
Lex->type|= BINCMP_FLAG;
}
-#line 23017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23013 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 783:
-#line 6126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->charset= (yyvsp[0].charset);
Lex->type|= BINCMP_FLAG;
}
-#line 23026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23022 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 784:
-#line 6133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 23032 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23028 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 785:
-#line 6134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= BINCMP_FLAG; }
-#line 23038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 788:
-#line 6149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6145 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.table)=(yyvsp[-3].table);
}
-#line 23046 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 789:
-#line 6156 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ref_list.empty(); }
-#line 23052 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 791:
-#line 6162 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6158 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Key_part_spec *key= new Key_part_spec((yyvsp[0].lex_str), 0);
if (key == NULL)
MYSQL_YYABORT;
Lex->ref_list.push_back(key);
}
-#line 23063 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23059 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 792:
-#line 6169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6165 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Key_part_spec *key= new Key_part_spec((yyvsp[0].lex_str), 0);
if (key == NULL)
@@ -23072,187 +23068,187 @@ yyreduce:
lex->ref_list.empty();
lex->ref_list.push_back(key);
}
-#line 23076 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23072 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 793:
-#line 6181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->fk_match_option= Foreign_key::FK_MATCH_UNDEF; }
-#line 23082 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 794:
-#line 6183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->fk_match_option= Foreign_key::FK_MATCH_FULL; }
-#line 23088 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 795:
-#line 6185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->fk_match_option= Foreign_key::FK_MATCH_PARTIAL; }
-#line 23094 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 796:
-#line 6187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->fk_match_option= Foreign_key::FK_MATCH_SIMPLE; }
-#line 23100 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23096 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 797:
-#line 6192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
lex->fk_delete_opt= Foreign_key::FK_OPTION_UNDEF;
}
-#line 23110 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23106 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 798:
-#line 6198 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->fk_update_opt= (yyvsp[0].m_fk_option);
lex->fk_delete_opt= Foreign_key::FK_OPTION_UNDEF;
}
-#line 23120 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23116 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 799:
-#line 6204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6200 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
lex->fk_delete_opt= (yyvsp[0].m_fk_option);
}
-#line 23130 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23126 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 800:
-#line 6211 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->fk_update_opt= (yyvsp[-3].m_fk_option);
lex->fk_delete_opt= (yyvsp[0].m_fk_option);
}
-#line 23140 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23136 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 801:
-#line 6218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->fk_update_opt= (yyvsp[0].m_fk_option);
lex->fk_delete_opt= (yyvsp[-3].m_fk_option);
}
-#line 23150 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23146 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 802:
-#line 6226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_fk_option)= Foreign_key::FK_OPTION_RESTRICT; }
-#line 23156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23152 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 803:
-#line 6227 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6223 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_fk_option)= Foreign_key::FK_OPTION_CASCADE; }
-#line 23162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23158 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 804:
-#line 6228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_fk_option)= Foreign_key::FK_OPTION_SET_NULL; }
-#line 23168 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23164 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 805:
-#line 6229 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_fk_option)= Foreign_key::FK_OPTION_NO_ACTION; }
-#line 23174 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23170 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 806:
-#line 6230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_fk_option)= Foreign_key::FK_OPTION_DEFAULT; }
-#line 23180 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23176 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 807:
-#line 6234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::MULTIPLE; }
-#line 23186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 808:
-#line 6238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::PRIMARY; }
-#line 23192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 809:
-#line 6239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::UNIQUE; }
-#line 23198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 810:
-#line 6243 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23204 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 811:
-#line 6244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23210 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23206 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 812:
-#line 6248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 814:
-#line 6253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6249 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23222 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23218 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 815:
-#line 6254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23228 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23224 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 816:
-#line 6255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 817:
-#line 6259 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::MULTIPLE; }
-#line 23240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23236 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 818:
-#line 6260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::UNIQUE; }
-#line 23246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23242 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 819:
-#line 6264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_type)= Key::FULLTEXT;}
-#line 23252 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23248 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 820:
-#line 6269 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6265 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
#ifdef HAVE_SPATIAL
(yyval.key_type)= Key::SPATIAL;
@@ -23262,100 +23258,100 @@ yyreduce:
MYSQL_YYABORT;
#endif
}
-#line 23266 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23262 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 821:
-#line 6281 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6277 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->key_create_info= default_key_create_info;
}
-#line 23274 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 824:
-#line 6298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6294 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23280 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23276 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 826:
-#line 6303 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6299 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23286 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23282 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 828:
-#line 6308 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6304 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23292 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23288 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 836:
-#line 6328 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6324 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->key_create_info.algorithm= (yyvsp[0].key_alg); }
-#line 23298 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23294 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 837:
-#line 6329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->key_create_info.algorithm= (yyvsp[0].key_alg); }
-#line 23304 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 838:
-#line 6334 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6330 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->key_create_info.block_size= (yyvsp[0].ulong_num); }
-#line 23310 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 839:
-#line 6335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6331 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->key_create_info.comment= (yyvsp[0].lex_str); }
-#line 23316 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 840:
-#line 6337 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6333 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), true, &Lex->option_list,
&Lex->option_list_last);
}
-#line 23326 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23322 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 841:
-#line 6343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].lex_str), false, &Lex->option_list,
&Lex->option_list_last);
}
-#line 23336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23332 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 842:
-#line 6349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), (yyvsp[0].ulonglong_number), &Lex->option_list,
&Lex->option_list_last, thd->mem_root);
}
-#line 23346 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 843:
-#line 6355 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
new (thd->mem_root)
engine_option_value((yyvsp[-2].lex_str), &Lex->option_list, &Lex->option_list_last);
}
-#line 23355 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23351 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 848:
-#line 6373 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (plugin_is_ready(&(yyvsp[0].lex_str), MYSQL_FTPARSER_PLUGIN))
Lex->key_create_info.parser_name= (yyvsp[0].lex_str);
@@ -23365,51 +23361,51 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 23369 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 849:
-#line 6385 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6381 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_alg)= HA_KEY_ALG_BTREE; }
-#line 23375 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 850:
-#line 6386 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6382 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_alg)= HA_KEY_ALG_RTREE; }
-#line 23381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 851:
-#line 6387 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6383 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.key_alg)= HA_KEY_ALG_HASH; }
-#line 23387 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23383 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 852:
-#line 6391 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6387 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->col_list.push_back((yyvsp[-1].key_part)); }
-#line 23393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 853:
-#line 6392 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6388 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->col_list.push_back((yyvsp[-1].key_part)); }
-#line 23399 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23395 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 854:
-#line 6397 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6393 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.key_part)= new Key_part_spec((yyvsp[0].lex_str), 0);
if ((yyval.key_part) == NULL)
MYSQL_YYABORT;
}
-#line 23409 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23405 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 855:
-#line 6403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6399 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
int key_part_len= atoi((yyvsp[-1].lex_str).str);
if (!key_part_len)
@@ -23420,47 +23416,47 @@ yyreduce:
if ((yyval.key_part) == NULL)
MYSQL_YYABORT;
}
-#line 23424 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23420 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 856:
-#line 6416 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6412 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= null_lex_str; }
-#line 23430 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 857:
-#line 6417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6413 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 23436 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23432 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 858:
-#line 6421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= null_lex_str; }
-#line 23442 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23438 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 859:
-#line 6422 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6418 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 23448 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23444 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 860:
-#line 6426 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6422 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->interval_list.push_back((yyvsp[0].string)); }
-#line 23454 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23450 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 861:
-#line 6427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->interval_list.push_back((yyvsp[0].string)); }
-#line 23460 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 862:
-#line 6435 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->name.str= 0;
@@ -23485,11 +23481,11 @@ yyreduce:
lex->create_last_non_select_table= lex->last_table();
DBUG_ASSERT(!lex->m_stmt);
}
-#line 23489 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 863:
-#line 6460 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6456 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
if (!lex->m_stmt)
@@ -23500,20 +23496,20 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 23504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 864:
-#line 6471 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6467 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_info.default_table_charset= NULL;
Lex->create_info.used_fields= 0;
}
-#line 23513 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23509 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 865:
-#line 6476 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6472 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_ALTER_DB;
@@ -23522,11 +23518,11 @@ yyreduce:
lex->copy_db_to(&lex->name.str, &lex->name.length))
MYSQL_YYABORT;
}
-#line 23526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 866:
-#line 6485 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6481 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->sphead)
@@ -23537,11 +23533,11 @@ yyreduce:
lex->sql_command= SQLCOM_ALTER_DB_UPGRADE;
lex->name= (yyvsp[-4].lex_str);
}
-#line 23541 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23537 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 867:
-#line 6496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -23552,22 +23548,22 @@ yyreduce:
}
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
}
-#line 23556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 868:
-#line 6507 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6503 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ALTER_PROCEDURE;
lex->spname= (yyvsp[-2].spname);
}
-#line 23567 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23563 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 869:
-#line 6514 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -23578,22 +23574,22 @@ yyreduce:
}
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
}
-#line 23582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 870:
-#line 6525 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6521 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ALTER_FUNCTION;
lex->spname= (yyvsp[-2].spname);
}
-#line 23593 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23589 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 871:
-#line 6532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -23604,17 +23600,17 @@ yyreduce:
}
lex->create_view_mode= VIEW_ALTER;
}
-#line 23608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 872:
-#line 6543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6539 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 873:
-#line 6550 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6546 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -23626,17 +23622,17 @@ yyreduce:
lex->create_view_algorithm= VIEW_ALGORITHM_INHERIT;
lex->create_view_mode= VIEW_ALTER;
}
-#line 23630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 874:
-#line 6562 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6558 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23636 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 875:
-#line 6564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
It is safe to use Lex->spname because
@@ -23652,11 +23648,11 @@ yyreduce:
Lex->sql_command= SQLCOM_ALTER_EVENT;
}
-#line 23656 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23652 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 876:
-#line 6584 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6580 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyvsp[-4].num) || (yyvsp[-3].num) || (yyvsp[-2].num) || (yyvsp[-1].num) || (yyvsp[0].num)))
{
@@ -23669,88 +23665,88 @@ yyreduce:
*/
Lex->sql_command= SQLCOM_ALTER_EVENT;
}
-#line 23673 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23669 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 877:
-#line 6597 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6593 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE;
}
-#line 23682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 878:
-#line 6602 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6598 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP;
}
-#line 23691 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23687 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 879:
-#line 6607 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6603 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE;
}
-#line 23700 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23696 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 880:
-#line 6612 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6608 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE;
}
-#line 23709 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23705 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 881:
-#line 6617 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6613 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_ALTER_SERVER;
lex->server_options.server_name= (yyvsp[-4].lex_str).str;
lex->server_options.server_name_length= (yyvsp[-4].lex_str).length;
}
-#line 23720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 882:
-#line 6626 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6622 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0;}
-#line 23726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23722 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 883:
-#line 6627 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6623 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 23732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23728 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 884:
-#line 6628 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6624 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 23738 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23734 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 885:
-#line 6629 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6625 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 23744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23740 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 886:
-#line 6633 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6629 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0;}
-#line 23750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23746 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 887:
-#line 6635 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6631 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Use lex's spname to hold the new name.
@@ -23759,65 +23755,65 @@ yyreduce:
Lex->spname= (yyvsp[0].spname);
(yyval.num)= 1;
}
-#line 23763 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 888:
-#line 6646 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6642 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0;}
-#line 23769 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23765 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 889:
-#line 6647 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6643 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 23775 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23771 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 890:
-#line 6651 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6647 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str).str= 0; (yyval.lex_str).length= 0; }
-#line 23781 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23777 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 891:
-#line 6652 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6648 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 23787 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23783 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 893:
-#line 6657 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6653 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->alter_info.tablespace_op= DISCARD_TABLESPACE; }
-#line 23793 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23789 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 894:
-#line 6658 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6654 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; }
-#line 23799 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23795 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 900:
-#line 6675 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6671 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_DROP_PARTITION;
}
-#line 23807 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23803 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 901:
-#line 6680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6676 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_info.flags|= ALTER_REBUILD_PARTITION;
lex->no_write_to_binlog= (yyvsp[-1].num);
}
-#line 23817 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23813 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 902:
-#line 6687 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6683 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->no_write_to_binlog= (yyvsp[-1].num);
@@ -23828,11 +23824,11 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 23832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 904:
-#line 6700 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6696 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->no_write_to_binlog= (yyvsp[-1].num);
@@ -23843,11 +23839,11 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 23847 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23843 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 905:
-#line 6711 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6707 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->check_opt.init();
@@ -23857,11 +23853,11 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 23861 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23857 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 907:
-#line 6723 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->no_write_to_binlog= (yyvsp[-1].num);
@@ -23872,22 +23868,22 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 23876 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23872 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 909:
-#line 6735 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6731 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_info.flags|= ALTER_COALESCE_PARTITION;
lex->no_write_to_binlog= (yyvsp[-1].num);
lex->alter_info.num_parts= (yyvsp[0].ulong_num);
}
-#line 23887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 910:
-#line 6742 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6738 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->check_opt.init();
@@ -23897,27 +23893,27 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 23901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 912:
-#line 6756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6752 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_REMOVE_PARTITIONING;
}
-#line 23909 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23905 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 913:
-#line 6763 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6759 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_ALL_PARTITION;
}
-#line 23917 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23913 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 915:
-#line 6771 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6767 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->part_info= new partition_info();
@@ -23929,34 +23925,34 @@ yyreduce:
lex->alter_info.flags|= ALTER_ADD_PARTITION;
lex->no_write_to_binlog= (yyvsp[0].num);
}
-#line 23933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23929 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 916:
-#line 6783 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 23939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23935 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 918:
-#line 6789 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6785 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->part_info->num_parts= lex->part_info->partitions.elements;
}
-#line 23948 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23944 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 919:
-#line 6794 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6790 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->part_info->num_parts= (yyvsp[0].ulong_num);
}
-#line 23956 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23952 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 920:
-#line 6801 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6797 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->part_info= new partition_info();
@@ -23967,48 +23963,48 @@ yyreduce:
}
lex->no_write_to_binlog= (yyvsp[0].num);
}
-#line 23971 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 922:
-#line 6816 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6812 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_TABLE_REORG;
}
-#line 23979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 923:
-#line 6820 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6816 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_REORGANIZE_PARTITION;
}
-#line 23987 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23983 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 924:
-#line 6824 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6820 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
partition_info *part_info= Lex->part_info;
part_info->num_parts= part_info->partitions.elements;
}
-#line 23996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23992 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 925:
-#line 6831 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6827 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 23998 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 926:
-#line 6832 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6828 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 927:
-#line 6837 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6833 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->alter_info.partition_names.push_back((yyvsp[0].lex_str).str))
{
@@ -24016,65 +24012,65 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 24020 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24016 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 930:
-#line 6857 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6853 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->change=0;
lex->alter_info.flags|= ALTER_ADD_COLUMN;
}
-#line 24030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 931:
-#line 6866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_last_non_select_table= Lex->last_table();
}
-#line 24038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 932:
-#line 6870 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_last_non_select_table= Lex->last_table();
Lex->alter_info.flags|= ALTER_ADD_INDEX;
}
-#line 24047 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24043 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 933:
-#line 6875 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6871 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_ADD_COLUMN | ALTER_ADD_INDEX;
}
-#line 24055 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24051 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 934:
-#line 6879 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6875 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->change= (yyvsp[0].lex_str).str;
lex->alter_info.flags|= ALTER_CHANGE_COLUMN;
lex->option_list= NULL;
}
-#line 24066 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 935:
-#line 6886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6882 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_last_non_select_table= Lex->last_table();
}
-#line 24074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24070 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 936:
-#line 6890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->length=lex->dec=0; lex->type=0;
@@ -24085,11 +24081,11 @@ yyreduce:
lex->vcol_info= 0;
lex->option_list= NULL;
}
-#line 24089 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24085 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 937:
-#line 6901 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6897 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (add_field_to_list(lex->thd,&(yyvsp[-2].lex_str),
@@ -24102,19 +24098,19 @@ yyreduce:
lex->vcol_info, lex->option_list))
MYSQL_YYABORT;
}
-#line 24106 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24102 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 938:
-#line 6914 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->create_last_non_select_table= Lex->last_table();
}
-#line 24114 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24110 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 939:
-#line 6918 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6914 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, (yyvsp[-1].lex_str).str);
@@ -24123,19 +24119,19 @@ yyreduce:
lex->alter_info.drop_list.push_back(ad);
lex->alter_info.flags|= ALTER_DROP_COLUMN;
}
-#line 24127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24123 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 940:
-#line 6927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6923 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_DROP_INDEX | ALTER_FOREIGN_KEY;
}
-#line 24135 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 941:
-#line 6931 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name);
@@ -24144,11 +24140,11 @@ yyreduce:
lex->alter_info.drop_list.push_back(ad);
lex->alter_info.flags|= ALTER_DROP_INDEX;
}
-#line 24148 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24144 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 942:
-#line 6940 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6936 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[0].lex_str).str);
@@ -24157,31 +24153,31 @@ yyreduce:
lex->alter_info.drop_list.push_back(ad);
lex->alter_info.flags|= ALTER_DROP_INDEX;
}
-#line 24161 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24157 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 943:
-#line 6949 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6945 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->alter_info.keys_onoff= DISABLE;
lex->alter_info.flags|= ALTER_KEYS_ONOFF;
}
-#line 24171 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24167 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 944:
-#line 6955 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6951 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->alter_info.keys_onoff= ENABLE;
lex->alter_info.flags|= ALTER_KEYS_ONOFF;
}
-#line 24181 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24177 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 945:
-#line 6961 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_column *ac= new Alter_column((yyvsp[-3].lex_str).str,(yyvsp[0].item));
@@ -24190,11 +24186,11 @@ yyreduce:
lex->alter_info.alter_list.push_back(ac);
lex->alter_info.flags|= ALTER_CHANGE_COLUMN_DEFAULT;
}
-#line 24194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 946:
-#line 6970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_column *ac= new Alter_column((yyvsp[-2].lex_str).str, (Item*) 0);
@@ -24203,11 +24199,11 @@ yyreduce:
lex->alter_info.alter_list.push_back(ac);
lex->alter_info.flags|= ALTER_CHANGE_COLUMN_DEFAULT;
}
-#line 24207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24203 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 947:
-#line 6979 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6975 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
size_t dummy;
@@ -24226,11 +24222,11 @@ yyreduce:
lex->name= (yyvsp[0].table)->table;
lex->alter_info.flags|= ALTER_RENAME;
}
-#line 24230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24226 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 948:
-#line 6998 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 6994 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!(yyvsp[-1].charset))
{
@@ -24250,11 +24246,11 @@ yyreduce:
HA_CREATE_USED_DEFAULT_CHARSET);
lex->alter_info.flags|= ALTER_CONVERT;
}
-#line 24254 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24250 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 949:
-#line 7018 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7014 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->alter_info.flags|= ALTER_OPTIONS;
@@ -24264,244 +24260,244 @@ yyreduce:
lex->create_info.used_fields&= ~HA_CREATE_USED_ENGINE;
}
}
-#line 24268 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 950:
-#line 7028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_RECREATE;
}
-#line 24276 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24272 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 951:
-#line 7032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->alter_info.flags|= ALTER_ORDER;
}
-#line 24285 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 952:
-#line 7039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 953:
-#line 7040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24293 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 954:
-#line 7044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= 0;}
-#line 24303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24299 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 955:
-#line 7045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7041 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= 1;}
-#line 24309 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24305 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 956:
-#line 7049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= Lex->online= 0;}
-#line 24315 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24311 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 962:
-#line 7063 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7059 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= 1;}
-#line 24321 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24317 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 963:
-#line 7064 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->online= 1;}
-#line 24327 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24323 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 964:
-#line 7068 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7064 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->drop_mode= DROP_DEFAULT; }
-#line 24333 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24329 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 965:
-#line 7069 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7065 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->drop_mode= DROP_RESTRICT; }
-#line 24339 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24335 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 966:
-#line 7070 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->drop_mode= DROP_CASCADE; }
-#line 24345 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24341 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 967:
-#line 7074 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7070 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24351 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24347 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 968:
-#line 7075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ store_position_for_column((yyvsp[0].lex_str).str); }
-#line 24357 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 969:
-#line 7076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7072 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ store_position_for_column(first_keyword); }
-#line 24363 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24359 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 970:
-#line 7080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24369 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 971:
-#line 7081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24375 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 972:
-#line 7082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 973:
-#line 7083 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24387 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24383 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 974:
-#line 7092 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0;
/* If you change this code don't forget to update SLAVE START too */
}
-#line 24398 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24394 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 975:
-#line 7099 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7095 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24404 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24400 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 976:
-#line 7101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0;
/* If you change this code don't forget to update SLAVE STOP too */
}
-#line 24415 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24411 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 977:
-#line 7108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7104 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0;
}
-#line 24425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 978:
-#line 7114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7110 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24427 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 979:
-#line 7116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0;
}
-#line 24441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 980:
-#line 7125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_BEGIN;
lex->start_transaction_opt= (yyvsp[0].num);
}
-#line 24451 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 981:
-#line 7133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 0; }
-#line 24457 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 982:
-#line 7135 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
}
-#line 24465 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24461 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 983:
-#line 7141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->slave_thd_opt= 0; }
-#line 24471 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24467 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 984:
-#line 7143 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7139 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24473 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 987:
-#line 7152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7148 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24483 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24479 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 988:
-#line 7153 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->slave_thd_opt|=SLAVE_SQL; }
-#line 24489 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 989:
-#line 7154 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7150 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->slave_thd_opt|=SLAVE_IO; }
-#line 24495 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 990:
-#line 7158 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7154 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24501 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 991:
-#line 7160 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7156 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (((lex->mi.log_file_name || lex->mi.pos) &&
@@ -24514,52 +24510,52 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 24518 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24514 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 994:
-#line 7181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_CHECKSUM;
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
-#line 24529 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24525 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 995:
-#line 7188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24535 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24531 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 996:
-#line 7192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags= 0; }
-#line 24541 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24537 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 997:
-#line 7193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags= T_QUICK; }
-#line 24547 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24543 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 998:
-#line 7194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags= T_EXTEND; }
-#line 24553 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24549 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1000:
-#line 7199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->only_view= TRUE; }
-#line 24559 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24555 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1002:
-#line 7204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7200 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPAIR;
@@ -24569,11 +24565,11 @@ yyreduce:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
-#line 24573 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24569 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1003:
-#line 7214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= thd->lex;
DBUG_ASSERT(!lex->m_stmt);
@@ -24581,65 +24577,65 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 24585 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24581 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1004:
-#line 7224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags = T_MEDIUM; }
-#line 24591 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24587 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1005:
-#line 7225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24597 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24593 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1006:
-#line 7229 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24603 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24599 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1007:
-#line 7230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24609 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24605 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1008:
-#line 7234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_QUICK; }
-#line 24615 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24611 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1009:
-#line 7235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7231 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_EXTEND; }
-#line 24621 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24617 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1010:
-#line 7236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.sql_flags|= TT_USEFRM; }
-#line 24627 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24623 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1011:
-#line 7240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 24633 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24629 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1012:
-#line 7241 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7237 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.sql_flags|= TT_FROM_MYSQL; }
-#line 24639 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24635 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1013:
-#line 7246 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7242 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_ANALYZE;
@@ -24649,11 +24645,11 @@ yyreduce:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
-#line 24653 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24649 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1014:
-#line 7256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= thd->lex;
DBUG_ASSERT(!lex->m_stmt);
@@ -24661,26 +24657,26 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 24665 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24661 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1015:
-#line 7267 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7263 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT;
Lex->comment= (yyvsp[0].lex_str);
}
-#line 24674 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1017:
-#line 7275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7271 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->only_view= TRUE; }
-#line 24680 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1019:
-#line 7279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
@@ -24690,11 +24686,11 @@ yyreduce:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
-#line 24694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1020:
-#line 7289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= thd->lex;
if (lex->sphead)
@@ -24707,83 +24703,83 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 24711 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24707 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1021:
-#line 7304 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags = T_MEDIUM; }
-#line 24717 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24713 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1022:
-#line 7305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24723 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24719 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1023:
-#line 7309 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24725 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1024:
-#line 7310 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7306 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24735 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24731 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1025:
-#line 7314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7310 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_QUICK; }
-#line 24741 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24737 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1026:
-#line 7315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7311 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_FAST; }
-#line 24747 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24743 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1027:
-#line 7316 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7312 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_MEDIUM; }
-#line 24753 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24749 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1028:
-#line 7317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7313 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_EXTEND; }
-#line 24759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24755 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1029:
-#line 7318 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
-#line 24765 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24761 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1030:
-#line 7319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
-#line 24771 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24767 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1031:
-#line 7323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 24777 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24773 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1032:
-#line 7324 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7320 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
-#line 24783 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24779 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1033:
-#line 7329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_OPTIMIZE;
@@ -24793,11 +24789,11 @@ yyreduce:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
-#line 24797 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24793 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1034:
-#line 7339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= thd->lex;
DBUG_ASSERT(!lex->m_stmt);
@@ -24805,69 +24801,69 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 24809 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24805 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1035:
-#line 7349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 24815 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24811 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1036:
-#line 7350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 24821 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24817 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1037:
-#line 7351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 24827 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24823 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1038:
-#line 7356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command= SQLCOM_RENAME_TABLE;
}
-#line 24835 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24831 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1039:
-#line 7360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24841 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24837 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1040:
-#line 7362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_RENAME_USER;
}
-#line 24849 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24845 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1041:
-#line 7369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7365 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[-2].lex_user)) || Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 24858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24854 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1042:
-#line 7374 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7370 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[-2].lex_user)) || Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 24867 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24863 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1045:
-#line 7387 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7383 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
SELECT_LEX *sl= lex->current_select;
@@ -24877,164 +24873,164 @@ yyreduce:
TL_IGNORE, MDL_EXCLUSIVE))
MYSQL_YYABORT;
}
-#line 24881 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24877 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1046:
-#line 7400 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7396 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.reset();
}
-#line 24889 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24885 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1047:
-#line 7404 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7400 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
lex->ident= (yyvsp[0].lex_str);
}
-#line 24899 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24895 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1052:
-#line 7423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7419 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[-1].table), NULL, 0, TL_READ,
MDL_SHARED_READ,
Select->pop_index_hints()))
MYSQL_YYABORT;
}
-#line 24910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24906 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1053:
-#line 7433 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7429 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[-2].table), NULL, 0, TL_READ,
MDL_SHARED_READ,
Select->pop_index_hints()))
MYSQL_YYABORT;
}
-#line 24921 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24917 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1054:
-#line 7442 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7438 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 24927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24923 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1055:
-#line 7443 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7439 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str) = default_key_cache_base; }
-#line 24933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24929 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1056:
-#line 7448 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7444 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_PRELOAD_KEYS;
lex->alter_info.reset();
}
-#line 24943 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1057:
-#line 7454 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7450 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 24949 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24945 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1062:
-#line 7469 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7465 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[-2].table), NULL, (yyvsp[0].num), TL_READ,
MDL_SHARED_READ,
Select->pop_index_hints()))
MYSQL_YYABORT;
}
-#line 24960 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24956 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1063:
-#line 7479 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7475 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[-3].table), NULL, (yyvsp[0].num), TL_READ,
MDL_SHARED_READ,
Select->pop_index_hints()))
MYSQL_YYABORT;
}
-#line 24971 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1064:
-#line 7489 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7485 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
}
-#line 24979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1066:
-#line 7496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->select_lex.alloc_index_hints(thd);
Select->set_index_hint_type(INDEX_HINT_USE,
INDEX_HINT_MASK_ALL);
}
-#line 24989 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1068:
-#line 7505 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7501 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 24995 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24991 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1070:
-#line 7511 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7507 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 25001 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 24997 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1071:
-#line 7512 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
-#line 25007 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25003 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1072:
-#line 7522 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7518 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SELECT;
}
-#line 25016 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1075:
-#line 7536 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (setup_select_in_parentheses(Lex))
MYSQL_YYABORT;
}
-#line 25025 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25021 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1077:
-#line 7546 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7542 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (setup_select_in_parentheses(Lex))
MYSQL_YYABORT;
}
-#line 25034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1079:
-#line 7555 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7551 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX * sel= lex->current_select;
@@ -25050,11 +25046,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 25054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25050 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1081:
-#line 7574 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7570 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -25062,35 +25058,35 @@ yyreduce:
mysql_init_select(lex);
lex->current_select->parsing_place= SELECT_LIST;
}
-#line 25066 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1082:
-#line 7582 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7578 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 25074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25070 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1084:
-#line 7589 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7585 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 25080 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25076 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1089:
-#line 7599 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7595 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->context.table_list=
Select->context.first_name_resolution_table=
Select->table_list.first;
}
-#line 25090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25086 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1092:
-#line 7614 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7610 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
{
@@ -25098,11 +25094,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 25102 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25098 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1096:
-#line 7631 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7627 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Allow this flag only on the first top-level SELECT statement, if
@@ -25130,11 +25126,11 @@ yyreduce:
Lex->select_lex.sql_cache= SELECT_LEX::SQL_NO_CACHE;
}
}
-#line 25134 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25130 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1097:
-#line 7659 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7655 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Allow this flag only on the first top-level SELECT statement, if
@@ -25162,32 +25158,32 @@ yyreduce:
Lex->select_lex.sql_cache= SELECT_LEX::SQL_CACHE;
}
}
-#line 25166 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1099:
-#line 7691 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7687 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->current_select->set_lock_for_tables(TL_WRITE);
lex->safe_to_cache_query=0;
}
-#line 25176 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25172 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1100:
-#line 7697 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7693 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->current_select->
set_lock_for_tables(TL_READ_WITH_SHARED_LOCKS);
lex->safe_to_cache_query=0;
}
-#line 25187 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25183 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1103:
-#line 7709 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7705 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root)
Item_field(&thd->lex->current_select->context,
@@ -25198,20 +25194,20 @@ yyreduce:
MYSQL_YYABORT;
(thd->lex->current_select->with_wild)++;
}
-#line 25202 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1104:
-#line 7723 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_item_to_list(thd, (yyvsp[-1].item)))
MYSQL_YYABORT;
}
-#line 25211 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1105:
-#line 7728 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7724 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT((yyvsp[-3].simple_string) < (yyvsp[-1].simple_string));
@@ -25233,87 +25229,87 @@ yyreduce:
(yyvsp[-2].item)->set_name((yyvsp[-3].simple_string), (uint) ((yyvsp[-1].simple_string) - (yyvsp[-3].simple_string)), thd->charset());
}
}
-#line 25237 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25233 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1106:
-#line 7752 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7748 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start();
}
-#line 25245 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25241 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1107:
-#line 7758 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7754 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.simple_string)= (char*) YYLIP->get_cpp_tok_end();
}
-#line 25253 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25249 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1108:
-#line 7764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=null_lex_str;}
-#line 25259 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25255 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1109:
-#line 7765 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7761 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 25265 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25261 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1110:
-#line 7766 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 25271 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25267 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1111:
-#line 7767 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7763 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 25277 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25273 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1112:
-#line 7768 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 25283 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25279 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1113:
-#line 7772 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7768 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 25289 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25285 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1114:
-#line 7773 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 25295 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1115:
-#line 7774 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7770 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (yyvsp[-1].ulong_num); }
-#line 25301 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1116:
-#line 7778 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7774 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 25307 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1117:
-#line 7779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 25313 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25309 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1118:
-#line 7785 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7781 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Design notes:
@@ -25364,22 +25360,22 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 25368 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25364 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1119:
-#line 7836 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7832 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* XOR is a proprietary extension */
(yyval.item) = new (thd->mem_root) Item_func_xor((yyvsp[-2].item), (yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25379 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25375 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1120:
-#line 7843 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7839 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* See comments in rule expr: expr or expr */
Item_cond_and *item1;
@@ -25422,141 +25418,141 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 25426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25422 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1121:
-#line 7886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7882 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= negate_expression(thd, (yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25436 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25432 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1122:
-#line 7892 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7888 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_istrue((yyvsp[-2].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25446 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25442 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1123:
-#line 7898 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7894 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnottrue((yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25452 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1124:
-#line 7904 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7900 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isfalse((yyvsp[-2].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25466 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1125:
-#line 7910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7906 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnotfalse((yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1126:
-#line 7916 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7912 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnull((yyvsp[-2].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1127:
-#line 7922 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7918 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnotnull((yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25496 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1129:
-#line 7932 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7928 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnull((yyvsp[-2].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25502 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1130:
-#line 7938 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_isnotnull((yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1131:
-#line 7944 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7940 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_equal((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1132:
-#line 7950 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7946 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= (*(yyvsp[-1].boolfunc2creator))(0)->create((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1133:
-#line 7956 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7952 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= all_any_subquery_creator((yyvsp[-5].item), (yyvsp[-4].boolfunc2creator), (yyvsp[-3].num), (yyvsp[-1].select_lex));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1135:
-#line 7966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7962 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_in_subselect((yyvsp[-4].item), (yyvsp[-1].select_lex));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1136:
-#line 7972 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7968 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[-5].item), (yyvsp[-1].select_lex));
if (item == NULL)
@@ -25565,21 +25561,21 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25569 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25565 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1137:
-#line 7981 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7977 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= handle_sql2003_note184_exception(thd, (yyvsp[-4].item), true, (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25575 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1138:
-#line 7987 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7983 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-1].item_list)->push_front((yyvsp[-3].item));
(yyvsp[-1].item_list)->push_front((yyvsp[-6].item));
@@ -25587,21 +25583,21 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25591 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25587 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1139:
-#line 7995 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7991 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= handle_sql2003_note184_exception(thd, (yyvsp[-5].item), false, (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25601 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25597 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1140:
-#line 8001 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 7997 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-1].item_list)->push_front((yyvsp[-3].item));
(yyvsp[-1].item_list)->push_front((yyvsp[-7].item));
@@ -25611,21 +25607,21 @@ yyreduce:
item->negate();
(yyval.item)= item;
}
-#line 25615 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25611 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1141:
-#line 8011 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8007 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_between((yyvsp[-4].item),(yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25625 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25621 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1142:
-#line 8017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8013 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_func_between *item;
item= new (thd->mem_root) Item_func_between((yyvsp[-5].item),(yyvsp[-2].item),(yyvsp[0].item));
@@ -25634,11 +25630,11 @@ yyreduce:
item->negate();
(yyval.item)= item;
}
-#line 25638 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25634 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1143:
-#line 8026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item1= new (thd->mem_root) Item_func_soundex((yyvsp[-3].item));
Item *item4= new (thd->mem_root) Item_func_soundex((yyvsp[0].item));
@@ -25648,21 +25644,21 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25652 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1144:
-#line 8036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_like((yyvsp[-3].item),(yyvsp[-1].item),(yyvsp[0].item),Lex->escape_used);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25662 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25658 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1145:
-#line 8042 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root) Item_func_like((yyvsp[-4].item),(yyvsp[-1].item),(yyvsp[0].item),
Lex->escape_used);
@@ -25672,21 +25668,21 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1146:
-#line 8052 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8048 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_regex((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25686 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1147:
-#line 8058 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8054 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root) Item_func_regex((yyvsp[-3].item),(yyvsp[0].item));
if (item == NULL)
@@ -25695,312 +25691,312 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25699 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25695 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1149:
-#line 8071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8067 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_bit_or((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25709 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25705 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1150:
-#line 8077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8073 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_bit_and((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25719 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25715 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1151:
-#line 8083 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_shift_left((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25725 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1152:
-#line 8089 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8085 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_shift_right((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25739 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25735 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1153:
-#line 8095 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8091 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_plus((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25749 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25745 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1154:
-#line 8101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_minus((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25755 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1155:
-#line 8107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8103 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-4].item),(yyvsp[-1].item),(yyvsp[0].interval),0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25769 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25765 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1156:
-#line 8113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8109 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-4].item),(yyvsp[-1].item),(yyvsp[0].interval),1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25779 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25775 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1157:
-#line 8119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_mul((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25789 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25785 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1158:
-#line 8125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_div((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25799 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25795 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1159:
-#line 8131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_mod((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25809 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25805 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1160:
-#line 8137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_int_div((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25819 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25815 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1161:
-#line 8143 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8139 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_mod((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25829 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25825 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1162:
-#line 8149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8145 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_bit_xor((yyvsp[-2].item),(yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 25839 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25835 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1172:
-#line 8178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8174 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_eq_creator; }
-#line 25845 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25841 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1173:
-#line 8179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_ge_creator; }
-#line 25851 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25847 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1174:
-#line 8180 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8176 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_gt_creator; }
-#line 25857 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25853 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1175:
-#line 8181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_le_creator; }
-#line 25863 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25859 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1176:
-#line 8182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_lt_creator; }
-#line 25869 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25865 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1177:
-#line 8183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.boolfunc2creator) = &comp_ne_creator; }
-#line 25875 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25871 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1178:
-#line 8187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 1; }
-#line 25881 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25877 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1179:
-#line 8188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 0; }
-#line 25887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1180:
-#line 8193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_NULL; /* automatic type */
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25894 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1181:
-#line 8199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (yyvsp[0].num); }
-#line 25904 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25900 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1182:
-#line 8204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8200 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_INT;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25915 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25911 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1183:
-#line 8211 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_UINT;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25926 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25922 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1184:
-#line 8218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_DOUBLE;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25937 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1185:
-#line 8225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_DOUBLE;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25948 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25944 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1186:
-#line 8232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_DOUBLE;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 25959 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25955 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1187:
-#line 8239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= DYN_COL_DECIMAL;
Lex->charset= NULL;
}
-#line 25968 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25964 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1188:
-#line 8244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_STRING;
lex->length= lex->dec= 0;
}
-#line 25978 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25974 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1189:
-#line 8250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8246 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_STRING;
lex->charset= national_charset_info;
lex->length= lex->dec= 0;
}
-#line 25989 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1190:
-#line 8257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_DATE;
lex->charset= NULL;
lex->length= lex->dec= 0;
}
-#line 26000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 25996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1191:
-#line 8264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_TIME;
@@ -26008,11 +26004,11 @@ yyreduce:
lex->dec= lex->length;
lex->length= 0;
}
-#line 26012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1192:
-#line 8272 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8268 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.num)= DYN_COL_DATETIME;
@@ -26020,11 +26016,11 @@ yyreduce:
lex->dec= lex->length;
lex->length= 0;
}
-#line 26024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26020 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1193:
-#line 8283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.dyncol_def)= (DYNCALL_CREATE_DEF *)
@@ -26044,31 +26040,31 @@ yyreduce:
else
(yyval.dyncol_def)->len= 0;
}
-#line 26048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26044 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1194:
-#line 8305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.dyncol_def_list)= new (thd->mem_root) List<DYNCALL_CREATE_DEF>;
if ((yyval.dyncol_def_list) == NULL)
MYSQL_YYABORT;
(yyval.dyncol_def_list)->push_back((yyvsp[0].dyncol_def));
}
-#line 26059 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26055 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1195:
-#line 8312 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8308 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-2].dyncol_def_list)->push_back((yyvsp[0].dyncol_def));
(yyval.dyncol_def_list)= (yyvsp[-2].dyncol_def_list);
}
-#line 26068 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26064 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1201:
-#line 8325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8321 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *i1= new (thd->mem_root) Item_string((yyvsp[0].lex_str).str,
(yyvsp[0].lex_str).length,
@@ -26079,113 +26075,113 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26083 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26079 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1206:
-#line 8340 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8336 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_concat((yyvsp[-2].item), (yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26093 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26089 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1207:
-#line 8346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8342 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= (yyvsp[0].item);
}
-#line 26101 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26097 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1208:
-#line 8350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_neg((yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26111 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26107 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1209:
-#line 8356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_bit_neg((yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26121 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26117 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1210:
-#line 8362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= negate_expression(thd, (yyvsp[0].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1211:
-#line 8368 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8364 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_singlerow_subselect((yyvsp[-1].select_lex));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1212:
-#line 8374 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8370 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[-1].item); }
-#line 26147 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26143 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1213:
-#line 8376 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8372 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-1].item_list)->push_front((yyvsp[-3].item));
(yyval.item)= new (thd->mem_root) Item_row(*(yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26158 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26154 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1214:
-#line 8383 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8379 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-1].item_list)->push_front((yyvsp[-3].item));
(yyval.item)= new (thd->mem_root) Item_row(*(yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26169 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26165 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1215:
-#line 8390 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8386 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_exists_subselect((yyvsp[-1].select_lex));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26179 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26175 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1216:
-#line 8396 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8392 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[-1].item); }
-#line 26185 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26181 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1217:
-#line 8398 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8394 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-5].item_list)->push_front((yyvsp[-2].item));
Item_func_match *i1= new (thd->mem_root) Item_func_match(*(yyvsp[-5].item_list), (yyvsp[-1].num));
@@ -26194,22 +26190,22 @@ yyreduce:
Select->add_ftfunc_to_list(i1);
(yyval.item)= i1;
}
-#line 26198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1218:
-#line 8407 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= create_func_cast(thd, (yyvsp[0].item), ITEM_CAST_CHAR, NULL, NULL,
&my_charset_bin);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26209 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26205 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1219:
-#line 8414 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8410 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.item)= create_func_cast(thd, (yyvsp[-3].item), (yyvsp[-1].cast_type), lex->length, lex->dec,
@@ -26217,42 +26213,42 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26217 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1220:
-#line 8422 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8418 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_case(* (yyvsp[-2].item_list), (yyvsp[-3].item), (yyvsp[-1].item) );
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26231 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26227 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1221:
-#line 8428 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8424 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= create_func_cast(thd, (yyvsp[-3].item), (yyvsp[-1].cast_type), Lex->length, Lex->dec,
Lex->charset);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26242 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26238 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1222:
-#line 8435 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_conv_charset((yyvsp[-3].item),(yyvsp[-1].charset));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26252 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26248 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1223:
-#line 8441 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8437 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if ((yyvsp[-1].item)->is_splocal())
{
@@ -26266,52 +26262,52 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26266 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1224:
-#line 8455 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8451 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_insert_value(Lex->current_context(),
(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26277 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1225:
-#line 8463 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8459 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[0].item),(yyvsp[-3].item),(yyvsp[-2].interval),0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1226:
-#line 8478 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8474 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_char(*(yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26301 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1227:
-#line 8484 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8480 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_char(*(yyvsp[-3].item_list), (yyvsp[-1].charset));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26311 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26307 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1228:
-#line 8490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8486 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_current_user(Lex->current_context());
if ((yyval.item) == NULL)
@@ -26319,51 +26315,51 @@ yyreduce:
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
Lex->safe_to_cache_query= 0;
}
-#line 26323 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26319 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1229:
-#line 8498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_typecast((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26333 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26329 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1230:
-#line 8504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8500 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_dayofmonth((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26343 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26339 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1231:
-#line 8510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8506 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_hour((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26349 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1232:
-#line 8516 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8512 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_insert((yyvsp[-7].item),(yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26363 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26359 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1233:
-#line 8522 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8518 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
List<Item> *list= new (thd->mem_root) List<Item>;
if (list == NULL)
@@ -26377,11 +26373,11 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1234:
-#line 8536 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-1].item_list)->push_front((yyvsp[-3].item));
(yyvsp[-1].item_list)->push_front((yyvsp[-5].item));
@@ -26392,171 +26388,171 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26396 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26392 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1235:
-#line 8547 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_left((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26406 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26402 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1236:
-#line 8553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_minute((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26416 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26412 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1237:
-#line 8559 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8555 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_month((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26422 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1238:
-#line 8565 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8561 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_right((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26436 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26432 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1239:
-#line 8571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8567 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_second((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26446 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26442 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1240:
-#line 8577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_time_typecast((yyvsp[-1].item), AUTO_SEC_PART_DIGITS);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26452 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1241:
-#line 8583 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8579 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_datetime_typecast((yyvsp[-1].item), AUTO_SEC_PART_DIGITS);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26466 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1242:
-#line 8589 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8585 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_add_time((yyvsp[-3].item), (yyvsp[-1].item), 1, 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1243:
-#line 8595 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8591 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1244:
-#line 8601 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8597 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[-1].item),(yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26496 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1245:
-#line 8607 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8603 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[-1].item),(yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26502 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1246:
-#line 8613 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8609 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[-1].item),(yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1247:
-#line 8619 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8615 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1248:
-#line 8625 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8621 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1249:
-#line 8631 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8627 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1250:
-#line 8637 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8633 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[-1].item),(yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1251:
-#line 8643 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8639 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_user();
if ((yyval.item) == NULL)
@@ -26564,186 +26560,186 @@ yyreduce:
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
Lex->safe_to_cache_query=0;
}
-#line 26568 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26564 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1252:
-#line 8651 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8647 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_year((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26574 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1253:
-#line 8672 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8668 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-3].item), (yyvsp[-1].item),
INTERVAL_DAY, 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26589 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26585 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1254:
-#line 8679 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8675 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26599 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26595 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1255:
-#line 8685 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8681 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_curdate_local();
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1256:
-#line 8692 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8688 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_curtime_local((yyvsp[0].num));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26621 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26617 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1257:
-#line 8700 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8696 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-5].item),(yyvsp[-2].item),(yyvsp[-1].interval),0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26631 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26627 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1258:
-#line 8707 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8703 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-5].item),(yyvsp[-2].item),(yyvsp[-1].interval),1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26641 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26637 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1259:
-#line 8713 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8709 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)=new (thd->mem_root) Item_extract( (yyvsp[-3].interval), (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26651 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26647 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1260:
-#line 8719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8715 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_get_format((yyvsp[-3].date_time_type), (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26661 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26657 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1261:
-#line 8725 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8721 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_now_local((yyvsp[0].num));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26668 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1262:
-#line 8732 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8728 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_func_locate((yyvsp[-1].item),(yyvsp[-3].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1263:
-#line 8738 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8734 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-3].item), (yyvsp[-1].item),
INTERVAL_DAY, 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26693 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26689 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1264:
-#line 8745 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8741 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-5].item), (yyvsp[-2].item), (yyvsp[-1].interval), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26703 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26699 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1265:
-#line 8751 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8747 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26713 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26709 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1266:
-#line 8757 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8753 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26723 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26719 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1267:
-#line 8763 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8759 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26733 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1268:
-#line 8769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8765 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26743 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26739 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1269:
-#line 8775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8771 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Unlike other time-related functions, SYSDATE() is
@@ -26761,114 +26757,114 @@ yyreduce:
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26765 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26761 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1270:
-#line 8793 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8789 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[-1].item),(yyvsp[-3].item),(yyvsp[-5].interval_time_st),0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26775 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26771 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1271:
-#line 8799 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8795 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_timestamp_diff((yyvsp[-3].item),(yyvsp[-1].item),(yyvsp[-5].interval_time_st));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26785 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26781 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1272:
-#line 8805 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8801 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_curdate_utc();
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1273:
-#line 8812 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8808 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_curtime_utc((yyvsp[0].num));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26807 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26803 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1274:
-#line 8819 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8815 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_now_utc((yyvsp[0].num));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1275:
-#line 8827 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8823 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= create_func_dyncol_add(thd, (yyvsp[-3].item), *(yyvsp[-1].dyncol_def_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26824 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1276:
-#line 8834 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8830 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= create_func_dyncol_delete(thd, (yyvsp[-3].item), *(yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1277:
-#line 8841 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8837 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_dyncol_exists((yyvsp[-3].item), (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26848 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26844 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1278:
-#line 8848 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8844 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_dyncol_list((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26854 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1279:
-#line 8855 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8851 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= create_func_dyncol_create(thd, *(yyvsp[-1].dyncol_def_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1280:
-#line 8862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8858 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
(yyval.item)= create_func_dyncol_get(thd, (yyvsp[-5].item), (yyvsp[-3].item), (yyvsp[-1].cast_type),
@@ -26877,112 +26873,112 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26881 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26877 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1281:
-#line 8879 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8875 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_ascii((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26891 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1282:
-#line 8885 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8881 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_charset((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1283:
-#line 8891 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8887 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_coalesce(* (yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26911 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26907 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1284:
-#line 8897 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8893 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_collation((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26921 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26917 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1285:
-#line 8903 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8899 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_database();
if ((yyval.item) == NULL)
MYSQL_YYABORT;
Lex->safe_to_cache_query=0;
}
-#line 26932 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26928 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1286:
-#line 8910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8906 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_if((yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26942 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26938 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1287:
-#line 8916 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8912 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_last_value(* (yyvsp[-1].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26952 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26948 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1288:
-#line 8922 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8918 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_microsecond((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26962 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26958 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1289:
-#line 8928 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8924 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_func_mod((yyvsp[-3].item), (yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26972 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26968 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1290:
-#line 8934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8930 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_old_password((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 26982 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26978 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1291:
-#line 8940 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8936 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item* i1;
if (thd->variables.old_passwords)
@@ -26993,51 +26989,51 @@ yyreduce:
MYSQL_YYABORT;
(yyval.item)= i1;
}
-#line 26997 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 26993 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1292:
-#line 8951 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8947 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_func_quarter((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27007 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27003 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1293:
-#line 8957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_repeat((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27013 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1294:
-#line 8963 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8959 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_replace((yyvsp[-5].item),(yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27027 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27023 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1295:
-#line 8969 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8965 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_round((yyvsp[-3].item),(yyvsp[-1].item),1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27037 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27033 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1296:
-#line 8975 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8971 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *i1= new (thd->mem_root) Item_int((char*) "0",
thd->variables.default_week_format,
@@ -27048,21 +27044,21 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27052 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1297:
-#line 8986 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8982 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_week((yyvsp[-3].item),(yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1298:
-#line 8992 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 8988 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
#ifdef HAVE_SPATIAL
(yyval.item)= (yyvsp[0].item);
@@ -27075,95 +27071,95 @@ yyreduce:
MYSQL_YYABORT;
#endif
}
-#line 27079 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27075 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1299:
-#line 9008 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_rel((yyvsp[-3].item), (yyvsp[-1].item),
Item_func::SP_CONTAINS_FUNC));
}
-#line 27089 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27085 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1300:
-#line 9014 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9010 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_geometrycollection,
Geometry::wkb_point));
}
-#line 27100 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27096 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1301:
-#line 9021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_linestring,
Geometry::wkb_point));
}
-#line 27111 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27107 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1302:
-#line 9028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_multilinestring,
Geometry::wkb_linestring));
}
-#line 27122 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27118 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1303:
-#line 9035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_multipoint,
Geometry::wkb_point));
}
-#line 27133 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27129 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1304:
-#line 9042 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_multipolygon,
Geometry::wkb_polygon));
}
-#line 27144 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27140 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1305:
-#line 9049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd, Item_func_point((yyvsp[-3].item),(yyvsp[-1].item)));
}
-#line 27152 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27148 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1306:
-#line 9053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= GEOM_NEW(thd,
Item_func_spatial_collection(* (yyvsp[-1].item_list),
Geometry::wkb_polygon,
Geometry::wkb_linestring));
}
-#line 27163 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27159 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1307:
-#line 9072 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9068 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
#ifdef HAVE_DLOPEN
udf_func *udf= 0;
@@ -27182,11 +27178,11 @@ yyreduce:
(yyval.udf)= udf;
#endif
}
-#line 27186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1308:
-#line 9091 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9087 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Create_func *builder;
Item *item= NULL;
@@ -27239,11 +27235,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27243 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27239 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1309:
-#line 9144 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9140 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Create_qfunc *builder;
Item *item= NULL;
@@ -27281,79 +27277,79 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27285 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1310:
-#line 9185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (yyvsp[-1].num) | (yyvsp[0].num); }
-#line 27291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27287 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1311:
-#line 9187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= FT_BOOL; }
-#line 27297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27293 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1312:
-#line 9191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= FT_NL; }
-#line 27303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27299 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1313:
-#line 9192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= FT_NL; }
-#line 27309 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27305 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1314:
-#line 9196 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 27315 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27311 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1315:
-#line 9197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= FT_EXPAND; }
-#line 27321 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27317 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1316:
-#line 9201 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= NULL; }
-#line 27327 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27323 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1317:
-#line 9202 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9198 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= (yyvsp[0].item_list); }
-#line 27333 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27329 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1318:
-#line 9207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_list)= new (thd->mem_root) List<Item>;
if ((yyval.item_list) == NULL)
MYSQL_YYABORT;
(yyval.item_list)->push_back((yyvsp[0].item));
}
-#line 27344 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27340 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1319:
-#line 9214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-2].item_list)->push_back((yyvsp[0].item));
(yyval.item_list)= (yyvsp[-2].item_list);
}
-#line 27353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27349 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1320:
-#line 9222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Use Item::name as a storage for the attribute value of user
@@ -27377,61 +27373,61 @@ yyreduce:
(yyvsp[-2].item)->set_name((yyvsp[-3].simple_string), (uint) ((yyvsp[-1].simple_string) - (yyvsp[-3].simple_string)), thd->charset());
(yyval.item)= (yyvsp[-2].item);
}
-#line 27381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1321:
-#line 9249 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9245 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_avg((yyvsp[-1].item), FALSE);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27391 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27387 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1322:
-#line 9255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_avg((yyvsp[-1].item), TRUE);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1323:
-#line 9261 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_and((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27411 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27407 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1324:
-#line 9267 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9263 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_or((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27417 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1325:
-#line 9273 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9269 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_xor((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27427 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1326:
-#line 9279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *item= new (thd->mem_root) Item_int((int32) 0L,1);
if (item == NULL)
@@ -27440,149 +27436,149 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27444 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27440 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1327:
-#line 9288 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9284 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_count((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27454 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27450 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1328:
-#line 9294 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9290 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->in_sum_expr++; }
-#line 27460 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1329:
-#line 9296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9292 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->in_sum_expr--; }
-#line 27466 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1330:
-#line 9298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9294 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_count(* (yyvsp[-2].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1331:
-#line 9304 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_min((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1332:
-#line 9315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9311 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_min((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27496 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1333:
-#line 9321 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27502 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1334:
-#line 9327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[-1].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1335:
-#line 9333 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[-1].item), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1336:
-#line 9339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[-1].item), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1337:
-#line 9345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9341 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[-1].item), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1338:
-#line 9351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[-1].item), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1339:
-#line 9357 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9353 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_sum((yyvsp[-1].item), FALSE);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27566 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27562 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1340:
-#line 9363 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9359 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_sum_sum((yyvsp[-1].item), TRUE);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 27576 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27572 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1341:
-#line 9369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9365 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->in_sum_expr++; }
-#line 27582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1342:
-#line 9373 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->in_sum_expr--;
@@ -27594,11 +27590,11 @@ yyreduce:
(yyvsp[-3].item_list)->empty();
sel->gorder_list.empty();
}
-#line 27598 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1343:
-#line 9388 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9384 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (! Lex->parsing_options.allows_variable)
{
@@ -27606,19 +27602,19 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1344:
-#line 9396 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9392 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= (yyvsp[0].item);
}
-#line 27618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1345:
-#line 9403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9399 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_func_set_user_var *item;
(yyval.item)= item= new (thd->mem_root) Item_func_set_user_var((yyvsp[-2].lex_str), (yyvsp[0].item));
@@ -27628,11 +27624,11 @@ yyreduce:
lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
lex->set_var_list.push_back(item);
}
-#line 27632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27628 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1346:
-#line 9413 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9409 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_func_get_user_var((yyvsp[0].lex_str));
if ((yyval.item) == NULL)
@@ -27640,11 +27636,11 @@ yyreduce:
LEX *lex= Lex;
lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
}
-#line 27644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27640 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1347:
-#line 9421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* disallow "SELECT @@global.global.variable" */
if ((yyvsp[-1].lex_str).str && (yyvsp[0].lex_str).str && check_reserved_words(&(yyvsp[-1].lex_str)))
@@ -27657,39 +27653,39 @@ yyreduce:
if (!((Item_func_get_system_var*) (yyval.item))->is_written_to_binlog())
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
}
-#line 27661 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27657 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1348:
-#line 9436 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9432 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 0; }
-#line 27667 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1349:
-#line 9437 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9433 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 1; }
-#line 27673 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27669 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1350:
-#line 9442 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9438 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.string)= new (thd->mem_root) String(",", 1, &my_charset_latin1);
if ((yyval.string) == NULL)
MYSQL_YYABORT;
}
-#line 27683 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27679 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1351:
-#line 9447 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9443 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.string) = (yyvsp[0].string); }
-#line 27689 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27685 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1353:
-#line 9453 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9449 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -27702,23 +27698,23 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1355:
-#line 9470 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9466 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_gorder_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 27712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27708 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1356:
-#line 9472 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9468 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_gorder_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 27718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1357:
-#line 9477 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9473 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->current_select->inc_in_sum_expr())
@@ -27727,200 +27723,200 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27731 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27727 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1358:
-#line 9486 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9482 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->in_sum_expr--;
(yyval.item)= (yyvsp[0].item);
}
-#line 27740 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1359:
-#line 9494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
-#line 27746 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27742 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1360:
-#line 9496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
-#line 27752 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1361:
-#line 9498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
-#line 27758 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27754 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1362:
-#line 9500 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27764 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27760 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1363:
-#line 9502 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27770 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27766 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1364:
-#line 9504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9500 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27776 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27772 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1365:
-#line 9506 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9502 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1366:
-#line 9508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27784 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1367:
-#line 9510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9506 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
-#line 27794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27790 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1368:
-#line 9512 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.cast_type)=ITEM_CAST_TIME;
LEX *lex= Lex;
lex->charset= NULL; lex->dec= lex->length; lex->length= (char*)0;
}
-#line 27804 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1369:
-#line 9518 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9514 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.cast_type)=ITEM_CAST_DATETIME;
LEX *lex= Lex;
lex->charset= NULL; lex->dec= lex->length; lex->length= (char*)0;
}
-#line 27814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1370:
-#line 9524 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9520 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
-#line 27820 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27816 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1371:
-#line 9526 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9522 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->charset= NULL; Lex->length= Lex->dec= 0;}
-#line 27826 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27822 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1372:
-#line 9528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9524 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.cast_type)=ITEM_CAST_DOUBLE; }
-#line 27832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1373:
-#line 9531 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9527 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= NULL; }
-#line 27838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1374:
-#line 9532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= (yyvsp[0].item_list);}
-#line 27844 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27840 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1375:
-#line 9537 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9533 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_list)= new (thd->mem_root) List<Item>;
if ((yyval.item_list) == NULL)
MYSQL_YYABORT;
(yyval.item_list)->push_back((yyvsp[0].item));
}
-#line 27855 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27851 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1376:
-#line 9544 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9540 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-2].item_list)->push_back((yyvsp[0].item));
(yyval.item_list)= (yyvsp[-2].item_list);
}
-#line 27864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27860 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1377:
-#line 9551 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9547 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= (yyvsp[0].item_list); }
-#line 27870 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27866 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1378:
-#line 9552 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9548 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item_list)= (yyvsp[-1].item_list); }
-#line 27876 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27872 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1379:
-#line 9557 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_list)= new (thd->mem_root) List<Item>;
if ((yyval.item_list) == NULL)
MYSQL_YYABORT;
(yyval.item_list)->push_back((yyvsp[0].item));
}
-#line 27887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1380:
-#line 9564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-2].item_list)->push_back((yyvsp[0].item));
(yyval.item_list)= (yyvsp[-2].item_list);
}
-#line 27896 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27892 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1381:
-#line 9571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9567 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= NULL; }
-#line 27902 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1382:
-#line 9572 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9568 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[0].item); }
-#line 27908 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27904 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1383:
-#line 9576 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9572 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= NULL; }
-#line 27914 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1384:
-#line 9577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[0].item); }
-#line 27920 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1385:
-#line 9582 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9578 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_list)= new List<Item>;
if ((yyval.item_list) == NULL)
@@ -27928,27 +27924,27 @@ yyreduce:
(yyval.item_list)->push_back((yyvsp[-2].item));
(yyval.item_list)->push_back((yyvsp[0].item));
}
-#line 27932 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27928 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1386:
-#line 9590 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9586 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-4].item_list)->push_back((yyvsp[-2].item));
(yyvsp[-4].item_list)->push_back((yyvsp[0].item));
(yyval.item_list)= (yyvsp[-4].item_list);
}
-#line 27942 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27938 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1387:
-#line 9600 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9596 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.table_list)=(yyvsp[0].table_list); }
-#line 27948 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27944 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1388:
-#line 9602 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9598 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd)))
@@ -27957,55 +27953,55 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 27961 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27957 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1389:
-#line 9613 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9609 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[0].table_list)); }
-#line 27967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27963 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1390:
-#line 9624 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9620 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.table_list)=(yyvsp[0].table_list); }
-#line 27973 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1391:
-#line 9625 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9621 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.table_list)=(yyvsp[-1].table_list); }
-#line 27979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1392:
-#line 9631 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9627 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.table_list)=(yyvsp[0].table_list); }
-#line 27985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27981 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1393:
-#line 9633 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9629 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-2].table_list) && ((yyval.table_list)=(yyvsp[0].table_list)));
}
-#line 27993 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27989 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1394:
-#line 9653 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9649 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ MYSQL_YYABORT_UNLESS((yyvsp[-2].table_list) && ((yyval.table_list)=(yyvsp[0].table_list))); }
-#line 27999 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 27995 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1395:
-#line 9655 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9651 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ MYSQL_YYABORT_UNLESS((yyvsp[-2].table_list) && ((yyval.table_list)=(yyvsp[0].table_list))); (yyvsp[0].table_list)->straight=1; }
-#line 28005 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28001 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1396:
-#line 9658 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9654 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-3].table_list) && (yyvsp[-1].table_list));
/* Change the current name resolution context to a local context. */
@@ -28013,21 +28009,21 @@ yyreduce:
MYSQL_YYABORT;
Select->parsing_place= IN_ON;
}
-#line 28017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28013 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1397:
-#line 9666 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9662 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
add_join_on((yyvsp[-3].table_list),(yyvsp[0].item));
Lex->pop_context();
Select->parsing_place= NO_MATTER;
}
-#line 28027 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28023 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1398:
-#line 9673 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9669 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-3].table_list) && (yyvsp[-1].table_list));
/* Change the current name resolution context to a local context. */
@@ -28035,45 +28031,45 @@ yyreduce:
MYSQL_YYABORT;
Select->parsing_place= IN_ON;
}
-#line 28039 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28035 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1399:
-#line 9681 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9677 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[-3].table_list)->straight=1;
add_join_on((yyvsp[-3].table_list),(yyvsp[0].item));
Lex->pop_context();
Select->parsing_place= NO_MATTER;
}
-#line 28050 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28046 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1400:
-#line 9689 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9685 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-3].table_list) && (yyvsp[-1].table_list));
}
-#line 28058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1401:
-#line 9693 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9689 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ add_join_natural((yyvsp[-7].table_list),(yyvsp[-5].table_list),(yyvsp[-1].string_list),Select); (yyval.table_list)=(yyvsp[-5].table_list); }
-#line 28064 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28060 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1402:
-#line 9695 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9691 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-3].table_list) && ((yyval.table_list)=(yyvsp[0].table_list)));
add_join_natural((yyvsp[-3].table_list),(yyvsp[0].table_list),NULL,Select);
}
-#line 28073 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28069 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1403:
-#line 9703 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9699 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-5].table_list) && (yyvsp[-1].table_list));
/* Change the current name resolution context to a local context. */
@@ -28081,11 +28077,11 @@ yyreduce:
MYSQL_YYABORT;
Select->parsing_place= IN_ON;
}
-#line 28085 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28081 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1404:
-#line 9711 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9707 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
add_join_on((yyvsp[-3].table_list),(yyvsp[0].item));
Lex->pop_context();
@@ -28093,40 +28089,40 @@ yyreduce:
(yyval.table_list)=(yyvsp[-3].table_list);
Select->parsing_place= NO_MATTER;
}
-#line 28097 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28093 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1405:
-#line 9719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9715 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-4].table_list) && (yyvsp[0].table_list));
}
-#line 28105 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28101 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1406:
-#line 9723 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
add_join_natural((yyvsp[-9].table_list),(yyvsp[-5].table_list),(yyvsp[-1].string_list),Select);
(yyvsp[-5].table_list)->outer_join|=JOIN_TYPE_LEFT;
(yyval.table_list)=(yyvsp[-5].table_list);
}
-#line 28115 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28111 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1407:
-#line 9729 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9725 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-5].table_list) && (yyvsp[0].table_list));
add_join_natural((yyvsp[-5].table_list),(yyvsp[0].table_list),NULL,Select);
(yyvsp[0].table_list)->outer_join|=JOIN_TYPE_LEFT;
(yyval.table_list)=(yyvsp[0].table_list);
}
-#line 28126 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28122 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1408:
-#line 9739 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9735 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-5].table_list) && (yyvsp[-1].table_list));
/* Change the current name resolution context to a local context. */
@@ -28134,11 +28130,11 @@ yyreduce:
MYSQL_YYABORT;
Select->parsing_place= IN_ON;
}
-#line 28138 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28134 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1409:
-#line 9747 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9743 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -28147,30 +28143,30 @@ yyreduce:
Lex->pop_context();
Select->parsing_place= NO_MATTER;
}
-#line 28151 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28147 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1410:
-#line 9756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9752 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-4].table_list) && (yyvsp[0].table_list));
}
-#line 28159 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28155 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1411:
-#line 9760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (!((yyval.table_list)= lex->current_select->convert_right_join()))
MYSQL_YYABORT;
add_join_natural((yyval.table_list),(yyvsp[-5].table_list),(yyvsp[-1].string_list),Select);
}
-#line 28170 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28166 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1412:
-#line 9767 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9763 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-5].table_list) && (yyvsp[0].table_list));
add_join_natural((yyvsp[0].table_list),(yyvsp[-5].table_list),NULL,Select);
@@ -28178,38 +28174,38 @@ yyreduce:
if (!((yyval.table_list)= lex->current_select->convert_right_join()))
MYSQL_YYABORT;
}
-#line 28182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28178 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1413:
-#line 9777 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9773 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28184 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1414:
-#line 9778 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9774 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1415:
-#line 9779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28196 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1416:
-#line 9791 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9787 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->table_join_options= 0;
}
-#line 28209 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28205 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1417:
-#line 9796 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9792 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.table_list)= Select->add_table_to_list(thd, (yyvsp[-2].table), (yyvsp[-1].lex_str_ptr),
Select->get_table_join_options(),
@@ -28219,11 +28215,11 @@ yyreduce:
MYSQL_YYABORT;
Select->add_joined_table((yyval.table_list));
}
-#line 28223 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28219 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1418:
-#line 9806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -28245,11 +28241,11 @@ yyreduce:
/* incomplete derived tables return NULL, we must be
nested in select_derived rule to be here. */
}
-#line 28249 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28245 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1419:
-#line 9846 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9842 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* Use $2 instead of Lex->current_select as derived table will
alter value of Lex->current_select. */
@@ -28312,11 +28308,11 @@ yyreduce:
!(yyval.table_list)->derived->first_select()->next_select())
(yyval.table_list)->select_lex->add_where_field((yyval.table_list)->derived->first_select());
}
-#line 28316 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1420:
-#line 9931 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if ((yyvsp[-1].table_list) && (yyvsp[0].is_not_empty))
{
@@ -28324,20 +28320,20 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 28328 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1421:
-#line 9941 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9937 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_select_to_union_list(Lex, (bool)(yyvsp[0].num), FALSE))
MYSQL_YYABORT;
}
-#line 28337 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28333 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1422:
-#line 9946 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9942 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Remove from the name resolution context stack the context of the
@@ -28345,11 +28341,11 @@ yyreduce:
*/
Lex->pop_context();
}
-#line 28349 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28345 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1423:
-#line 9954 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9950 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if ((yyvsp[-6].table_list) != NULL)
{
@@ -28357,11 +28353,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 28361 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28357 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1424:
-#line 9966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9962 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX * sel= lex->current_select;
@@ -28377,11 +28373,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 28381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1425:
-#line 9985 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9981 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -28389,29 +28385,29 @@ yyreduce:
mysql_init_select(lex);
lex->current_select->parsing_place= SELECT_LIST;
}
-#line 28393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1426:
-#line 9993 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9989 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 28401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1428:
-#line 10002 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 9998 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if ((yyvsp[0].select_lex)->init_nested_join(lex->thd))
MYSQL_YYABORT;
}
-#line 28411 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28407 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1429:
-#line 10008 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
/* for normal joins, $3 != NULL and end_nested_join() != NULL,
@@ -28425,11 +28421,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 28429 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1430:
-#line 10024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10020 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->derived_tables|= DERIVED_SUBQUERY;
@@ -28446,25 +28442,25 @@ yyreduce:
lex->current_select->linkage= DERIVED_TABLE_TYPE;
lex->current_select->parsing_place= SELECT_LIST;
}
-#line 28450 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28446 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1431:
-#line 10041 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10037 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 28458 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28454 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1433:
-#line 10048 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.select_lex)= Select; }
-#line 28464 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28460 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1434:
-#line 10053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -28487,113 +28483,113 @@ yyreduce:
!embedding->nested_join->join_list.elements;
/* return true if we are deeply nested */
}
-#line 28491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28487 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1435:
-#line 10078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10074 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28493 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1436:
-#line 10079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28503 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28499 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1437:
-#line 10084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= thd->variables.old_mode ? INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL;
}
-#line 28511 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28507 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1438:
-#line 10087 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10083 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= INDEX_HINT_MASK_JOIN; }
-#line 28517 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28513 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1439:
-#line 10088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= INDEX_HINT_MASK_ORDER; }
-#line 28523 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28519 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1440:
-#line 10089 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10085 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= INDEX_HINT_MASK_GROUP; }
-#line 28529 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28525 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1441:
-#line 10093 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10089 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.index_hint)= INDEX_HINT_FORCE; }
-#line 28535 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28531 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1442:
-#line 10094 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10090 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.index_hint)= INDEX_HINT_IGNORE; }
-#line 28541 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28537 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1443:
-#line 10099 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10095 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->set_index_hint_type((yyvsp[-2].index_hint), (yyvsp[0].num));
}
-#line 28549 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28545 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1445:
-#line 10104 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10100 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->set_index_hint_type(INDEX_HINT_USE, (yyvsp[0].num));
}
-#line 28557 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28553 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1450:
-#line 10117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->alloc_index_hints(thd); }
-#line 28563 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28559 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1452:
-#line 10121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->clear_index_hints(); }
-#line 28569 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28565 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1454:
-#line 10126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->add_index_hint(thd, NULL, 0); }
-#line 28575 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28571 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1455:
-#line 10127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28581 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28577 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1456:
-#line 10132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10128 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->add_index_hint(thd, (yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length); }
-#line 28587 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28583 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1457:
-#line 10134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->add_index_hint(thd, (char *)"PRIMARY", 7); }
-#line 28593 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28589 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1460:
-#line 10144 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10140 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.string_list)= new List<String>))
MYSQL_YYABORT;
@@ -28604,11 +28600,11 @@ yyreduce:
MYSQL_YYABORT;
(yyval.string_list)->push_back(s);
}
-#line 28608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1461:
-#line 10155 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10151 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
String *s= new (thd->mem_root) String((const char *) (yyvsp[0].lex_str).str,
(yyvsp[0].lex_str).length,
@@ -28618,191 +28614,191 @@ yyreduce:
(yyvsp[-2].string_list)->push_back(s);
(yyval.string_list)= (yyvsp[-2].string_list);
}
-#line 28622 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1462:
-#line 10167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28628 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28624 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1463:
-#line 10168 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10164 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_DAY_HOUR; }
-#line 28634 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1464:
-#line 10169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10165 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
-#line 28640 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28636 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1465:
-#line 10170 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10166 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_DAY_MINUTE; }
-#line 28646 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28642 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1466:
-#line 10171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_DAY_SECOND; }
-#line 28652 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1467:
-#line 10172 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10168 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
-#line 28658 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28654 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1468:
-#line 10173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_HOUR_MINUTE; }
-#line 28664 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28660 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1469:
-#line 10174 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10170 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_HOUR_SECOND; }
-#line 28670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28666 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1470:
-#line 10175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
-#line 28676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1471:
-#line 10176 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10172 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_MINUTE_SECOND; }
-#line 28682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1472:
-#line 10177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
-#line 28688 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28684 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1473:
-#line 10178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10174 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval)=INTERVAL_YEAR_MONTH; }
-#line 28694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1474:
-#line 10182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_DAY; }
-#line 28700 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28696 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1475:
-#line 10183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_WEEK; }
-#line 28706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1476:
-#line 10184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10180 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_HOUR; }
-#line 28712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28708 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1477:
-#line 10185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_MINUTE; }
-#line 28718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1478:
-#line 10186 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_MONTH; }
-#line 28724 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1479:
-#line 10187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_QUARTER; }
-#line 28730 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1480:
-#line 10188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_SECOND; }
-#line 28736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1481:
-#line 10189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
-#line 28742 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28738 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1482:
-#line 10190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10186 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.interval_time_st)=INTERVAL_YEAR; }
-#line 28748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1483:
-#line 10194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATE;}
-#line 28754 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1484:
-#line 10195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.date_time_type)=MYSQL_TIMESTAMP_TIME;}
-#line 28760 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28756 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1485:
-#line 10196 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
-#line 28766 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28762 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1486:
-#line 10197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
-#line 28772 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28768 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1490:
-#line 10207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str_ptr)=0; }
-#line 28778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28774 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1491:
-#line 10209 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10205 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_str_ptr)= (LEX_STRING*) sql_memdup(&(yyvsp[0].lex_str),sizeof(LEX_STRING));
if ((yyval.lex_str_ptr) == NULL)
MYSQL_YYABORT;
}
-#line 28788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28784 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1494:
-#line 10222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->where= 0; }
-#line 28794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28790 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1495:
-#line 10224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= IN_WHERE;
}
-#line 28802 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28798 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1496:
-#line 10228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *select= Select;
select->where= normalize_cond((yyvsp[0].item));
@@ -28810,19 +28806,19 @@ yyreduce:
if ((yyvsp[0].item))
(yyvsp[0].item)->top_level_item();
}
-#line 28814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1498:
-#line 10240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= IN_HAVING;
}
-#line 28822 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1499:
-#line 10244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->having= normalize_cond((yyvsp[0].item));
@@ -28830,20 +28826,20 @@ yyreduce:
if ((yyvsp[0].item))
(yyvsp[0].item)->top_level_item();
}
-#line 28834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28830 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1500:
-#line 10255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->escape_used= TRUE;
(yyval.item)= (yyvsp[0].item);
}
-#line 28843 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28839 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1501:
-#line 10260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->escape_used= FALSE;
(yyval.item)= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
@@ -28852,29 +28848,29 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 28856 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1504:
-#line 10281 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10277 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_group_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 28862 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1505:
-#line 10283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_group_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 28868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1506:
-#line 10287 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 28874 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28870 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1507:
-#line 10289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
'WITH CUBE' is reserved in the MySQL syntax, but not implemented,
@@ -28894,11 +28890,11 @@ yyreduce:
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "CUBE");
MYSQL_YYABORT;
}
-#line 28898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28894 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1508:
-#line 10309 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
'WITH ROLLUP' is needed for backward compatibility,
@@ -28916,21 +28912,21 @@ yyreduce:
}
lex->current_select->olap= ROLLUP_TYPE;
}
-#line 28920 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1512:
-#line 10343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
bool ascending= ((yyvsp[0].num) == 1) ? true : false;
if (add_order_to_list(thd, (yyvsp[-1].item), ascending))
MYSQL_YYABORT;
}
-#line 28930 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28926 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1515:
-#line 10361 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10357 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
SELECT_LEX *sel= lex->current_select;
@@ -28961,41 +28957,41 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 28965 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28961 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1517:
-#line 10396 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10392 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_order_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 28971 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1518:
-#line 10398 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10394 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ if (add_order_to_list(thd, (yyvsp[-1].item),(bool) (yyvsp[0].num))) MYSQL_YYABORT; }
-#line 28977 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28973 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1519:
-#line 10402 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10398 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) = 1; }
-#line 28983 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1520:
-#line 10403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10399 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) =1; }
-#line 28989 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1521:
-#line 10404 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10400 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num) =0; }
-#line 28995 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 28991 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1522:
-#line 10409 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10405 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
@@ -29003,86 +28999,86 @@ yyreduce:
sel->select_limit= 0;
lex->limit_rows_examined= 0;
}
-#line 29007 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29003 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1523:
-#line 10416 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10412 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29013 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29009 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1524:
-#line 10420 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10416 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29019 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29015 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1525:
-#line 10421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29025 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29021 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1526:
-#line 10426 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10422 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
}
-#line 29033 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29029 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1527:
-#line 10430 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10426 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
}
-#line 29041 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29037 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1528:
-#line 10434 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10430 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
}
-#line 29049 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29045 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1529:
-#line 10441 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10437 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[0].item);
sel->offset_limit= 0;
sel->explicit_limit= 1;
}
-#line 29060 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29056 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1530:
-#line 10448 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10444 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[0].item);
sel->offset_limit= (yyvsp[-2].item);
sel->explicit_limit= 1;
}
-#line 29071 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29067 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1531:
-#line 10455 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10451 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[-2].item);
sel->offset_limit= (yyvsp[0].item);
sel->explicit_limit= 1;
}
-#line 29082 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1532:
-#line 10465 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10461 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_splocal *splocal;
LEX *lex= thd->lex;
@@ -29115,252 +29111,252 @@ yyreduce:
splocal->limit_clause_param= TRUE;
(yyval.item)= splocal;
}
-#line 29119 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29115 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1533:
-#line 10498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
((Item_param *) (yyvsp[0].item))->limit_clause_param= TRUE;
}
-#line 29127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29123 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1534:
-#line 10502 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_uint((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 29137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29133 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1535:
-#line 10508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_uint((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 29147 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29143 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1536:
-#line 10514 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_uint((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 29157 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29153 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1537:
-#line 10523 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10519 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->limit_rows_examined= (yyvsp[0].item);
}
-#line 29166 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1538:
-#line 10530 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10526 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->current_select->select_limit= 0;
}
-#line 29175 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29171 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1539:
-#line 10535 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10531 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
sel->select_limit= (yyvsp[0].item);
Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
sel->explicit_limit= 1;
}
-#line 29186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1540:
-#line 10541 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10537 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; }
-#line 29192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1541:
-#line 10542 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10538 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; }
-#line 29198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1542:
-#line 10546 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10542 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.num)= (int) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29204 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1543:
-#line 10547 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.num)= -(int) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29210 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29206 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1544:
-#line 10548 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10544 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.num)= -(int) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1545:
-#line 10552 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10548 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29222 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29218 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1546:
-#line 10553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulong_num)= (ulong) strtol((yyvsp[0].lex_str).str, (char**) 0, 16); }
-#line 29228 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29224 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1547:
-#line 10554 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10550 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1548:
-#line 10555 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10551 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29236 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1549:
-#line 10556 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10552 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29242 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1550:
-#line 10557 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29252 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29248 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1551:
-#line 10561 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10557 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29258 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29254 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1552:
-#line 10562 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10558 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulong_num)= (ulong) strtol((yyvsp[0].lex_str).str, (char**) 0, 16); }
-#line 29264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29260 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1553:
-#line 10563 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10559 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29266 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1554:
-#line 10564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29276 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29272 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1555:
-#line 10565 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10561 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ MYSQL_YYABORT; }
-#line 29282 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29278 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1556:
-#line 10569 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10565 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29288 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29284 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1557:
-#line 10570 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10566 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29294 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29290 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1558:
-#line 10571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10567 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29296 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1559:
-#line 10572 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10568 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29302 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1560:
-#line 10573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10569 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29308 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1561:
-#line 10577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1562:
-#line 10578 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10574 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29320 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1563:
-#line 10579 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10575 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ulonglong_number)= strtoull((yyvsp[0].lex_str).str, (char**) 0, 16); }
-#line 29330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29326 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1564:
-#line 10580 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10576 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[0].lex_str).str, (char**) 0, &error); }
-#line 29336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29332 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1565:
-#line 10581 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ MYSQL_YYABORT; }
-#line 29342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29338 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1566:
-#line 10586 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10582 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); }
-#line 29348 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29344 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1569:
-#line 10595 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10591 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.choice)= (yyvsp[0].ulong_num) != 0 ? HA_CHOICE_YES : HA_CHOICE_NO; }
-#line 29354 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29350 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1570:
-#line 10596 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10592 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.choice)= HA_CHOICE_UNDEF; }
-#line 29360 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29356 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1572:
-#line 10602 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10598 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
@@ -29395,65 +29391,65 @@ yyreduce:
*/
Lex->expr_allows_subselect= false;
}
-#line 29399 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29395 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1573:
-#line 10637 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10633 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* Subqueries are allowed from now.*/
Lex->expr_allows_subselect= true;
}
-#line 29408 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29404 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1574:
-#line 10644 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10640 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29414 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29410 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1575:
-#line 10645 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10641 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29420 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29416 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1578:
-#line 10655 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10651 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_proc_to_list(thd, (yyvsp[-1].item)))
MYSQL_YYABORT;
if (!(yyvsp[-1].item)->name)
(yyvsp[-1].item)->set_name((yyvsp[-2].simple_string), (uint) ((yyvsp[0].simple_string) - (yyvsp[-2].simple_string)), thd->charset());
}
-#line 29431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29427 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1579:
-#line 10664 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10660 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!lex->describe && (!(lex->result= new select_dumpvar())))
MYSQL_YYABORT;
}
-#line 29441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1580:
-#line 10670 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10666 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29443 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1582:
-#line 10675 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10671 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29449 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1583:
-#line 10680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10676 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->result)
@@ -29472,11 +29468,11 @@ yyreduce:
DBUG_ASSERT(lex->describe);
}
}
-#line 29476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1584:
-#line 10699 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10695 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
sp_variable_t *t;
@@ -29505,11 +29501,11 @@ yyreduce:
DBUG_ASSERT(lex->describe);
}
}
-#line 29509 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29505 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1585:
-#line 10731 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10727 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (! Lex->parsing_options.allows_select_into)
{
@@ -29517,11 +29513,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 29521 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29517 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1587:
-#line 10743 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10739 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
@@ -29529,17 +29525,17 @@ yyreduce:
!(lex->result= new select_export(lex->exchange)))
MYSQL_YYABORT;
}
-#line 29533 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29529 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1588:
-#line 10751 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10747 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->exchange->cs= (yyvsp[0].charset); }
-#line 29539 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29535 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1590:
-#line 10754 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10750 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!lex->describe)
@@ -29551,37 +29547,37 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 29555 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29551 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1591:
-#line 10766 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
}
-#line 29563 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29559 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1592:
-#line 10777 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10773 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DO;
mysql_init_select(lex);
}
-#line 29573 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29569 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1593:
-#line 10783 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->insert_list= (yyvsp[0].item_list);
}
-#line 29581 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29577 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1594:
-#line 10794 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10790 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_DROP_TABLE;
@@ -29590,23 +29586,23 @@ yyreduce:
YYPS->m_lock_type= TL_UNLOCK;
YYPS->m_mdl_type= MDL_EXCLUSIVE;
}
-#line 29594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29590 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1595:
-#line 10803 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10799 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29596 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1596:
-#line 10804 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10800 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29602 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1597:
-#line 10805 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10801 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[-3].lex_str).str);
@@ -29622,22 +29618,22 @@ yyreduce:
MDL_SHARED_NO_WRITE))
MYSQL_YYABORT;
}
-#line 29626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29622 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1598:
-#line 10821 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10817 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_DROP_DB;
lex->drop_if_exists=(yyvsp[-1].num);
lex->name= (yyvsp[0].lex_str);
}
-#line 29637 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29633 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1599:
-#line 10828 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10824 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
sp_name *spname;
@@ -29659,11 +29655,11 @@ yyreduce:
spname->init_qname(thd);
lex->spname= spname;
}
-#line 29663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29659 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1600:
-#line 10850 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10846 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
LEX_STRING db= {0, 0};
@@ -29683,11 +29679,11 @@ yyreduce:
spname->init_qname(thd);
lex->spname= spname;
}
-#line 29687 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29683 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1601:
-#line 10870 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->sphead)
@@ -29699,19 +29695,19 @@ yyreduce:
lex->drop_if_exists= (yyvsp[-1].num);
lex->spname= (yyvsp[0].spname);
}
-#line 29703 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29699 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1602:
-#line 10882 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10878 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_DROP_USER;
}
-#line 29711 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29707 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1603:
-#line 10886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10882 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DROP_VIEW;
@@ -29719,67 +29715,67 @@ yyreduce:
YYPS->m_lock_type= TL_UNLOCK;
YYPS->m_mdl_type= MDL_EXCLUSIVE;
}
-#line 29723 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29719 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1604:
-#line 10894 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29725 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1605:
-#line 10896 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10892 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->drop_if_exists= (yyvsp[-1].num);
Lex->spname= (yyvsp[0].spname);
Lex->sql_command = SQLCOM_DROP_EVENT;
}
-#line 29739 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29735 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1606:
-#line 10902 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10898 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DROP_TRIGGER;
lex->drop_if_exists= (yyvsp[-1].num);
lex->spname= (yyvsp[0].spname);
}
-#line 29750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29746 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1607:
-#line 10909 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10905 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE;
}
-#line 29759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29755 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1608:
-#line 10914 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
}
-#line 29768 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29764 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1609:
-#line 10919 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10915 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_DROP_SERVER;
Lex->drop_if_exists= (yyvsp[-1].num);
Lex->server_options.server_name= (yyvsp[0].lex_str).str;
Lex->server_options.server_name_length= (yyvsp[0].lex_str).length;
}
-#line 29779 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29775 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1612:
-#line 10934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10930 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[0].table), NULL,
TL_OPTION_UPDATING,
@@ -29787,11 +29783,11 @@ yyreduce:
YYPS->m_mdl_type))
MYSQL_YYABORT;
}
-#line 29791 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29787 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1615:
-#line 10950 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10946 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[0].table), NULL,
TL_OPTION_UPDATING | TL_OPTION_ALIAS,
@@ -29799,87 +29795,87 @@ yyreduce:
YYPS->m_mdl_type))
MYSQL_YYABORT;
}
-#line 29803 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29799 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1616:
-#line 10960 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10956 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 29809 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29805 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1617:
-#line 10961 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 29815 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29811 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1618:
-#line 10965 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10961 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 29821 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29817 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1619:
-#line 10966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10962 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 29827 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29823 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1620:
-#line 10974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSERT;
lex->duplicates= DUP_ERROR;
mysql_init_select(lex);
}
-#line 29838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1621:
-#line 10982 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10978 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->set_lock_for_tables((yyvsp[-2].lock_type));
Lex->current_select= &Lex->select_lex;
}
-#line 29847 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29843 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1622:
-#line 10987 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10983 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29853 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29849 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1623:
-#line 10992 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10988 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPLACE;
lex->duplicates= DUP_REPLACE;
mysql_init_select(lex);
}
-#line 29864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29860 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1624:
-#line 10999 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 10995 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->set_lock_for_tables((yyvsp[-1].lock_type));
Lex->current_select= &Lex->select_lex;
}
-#line 29873 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29869 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1625:
-#line 11004 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11000 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29879 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29875 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1626:
-#line 11009 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11005 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
If it is SP we do not allow insert optimisation when result of
@@ -29888,17 +29884,17 @@ yyreduce:
*/
(yyval.lock_type)= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT);
}
-#line 29892 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29888 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1627:
-#line 11017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11013 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 29898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29894 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1628:
-#line 11019 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11015 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
thd->query());
@@ -29906,23 +29902,23 @@ yyreduce:
YYLIP->yyLength() + 1;
(yyval.lock_type)= TL_WRITE_DELAYED;
}
-#line 29910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29906 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1629:
-#line 11026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE; }
-#line 29916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29912 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1630:
-#line 11030 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= (yyvsp[0].lock_type); }
-#line 29922 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29918 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1631:
-#line 11032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
thd->query());
@@ -29930,222 +29926,222 @@ yyreduce:
YYLIP->yyLength() + 1;
(yyval.lock_type)= TL_WRITE_DELAYED;
}
-#line 29934 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29930 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1632:
-#line 11042 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29940 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29936 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1633:
-#line 11043 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29946 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29942 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1634:
-#line 11048 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->field_list.empty();
lex->many_values.empty();
lex->insert_list=0;
}
-#line 29957 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29953 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1635:
-#line 11056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11052 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29963 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29959 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1636:
-#line 11057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29965 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1637:
-#line 11058 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11054 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 29975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29971 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1638:
-#line 11060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!(lex->insert_list = new List_item) ||
lex->many_values.push_back(lex->insert_list))
MYSQL_YYABORT;
}
-#line 29986 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29982 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1640:
-#line 11070 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->field_list.push_back((yyvsp[0].item)); }
-#line 29992 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29988 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1641:
-#line 11071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11067 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->field_list.push_back((yyvsp[0].item)); }
-#line 29998 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 29994 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1642:
-#line 11075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1643:
-#line 11076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11072 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30010 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1644:
-#line 11078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11074 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->set_braces(0);}
-#line 30016 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1645:
-#line 11079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30022 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1646:
-#line 11081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->set_braces(1);}
-#line 30028 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1647:
-#line 11082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1652:
-#line 11097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11093 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->field_list.push_back((yyvsp[-2].item)) ||
lex->insert_list->push_back((yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 30045 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30041 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1653:
-#line 11106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30051 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30047 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1654:
-#line 11107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11103 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30057 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30053 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1655:
-#line 11111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30063 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30059 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1656:
-#line 11112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30069 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30065 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1657:
-#line 11117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!(Lex->insert_list = new List_item))
MYSQL_YYABORT;
}
-#line 30078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1658:
-#line 11122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->many_values.push_back(lex->insert_list))
MYSQL_YYABORT;
}
-#line 30088 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1659:
-#line 11130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30094 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1661:
-#line 11136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->insert_list->push_back((yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 30103 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30099 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1662:
-#line 11141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->insert_list->push_back((yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 30112 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30108 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1663:
-#line 11148 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11144 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[0].item);}
-#line 30118 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30114 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1664:
-#line 11150 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11146 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_default_value(Lex->current_context());
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 30128 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30124 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1666:
-#line 11159 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11155 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->duplicates= DUP_UPDATE; }
-#line 30134 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30130 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1668:
-#line 11167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
mysql_init_select(lex);
lex->sql_command= SQLCOM_UPDATE;
lex->duplicates= DUP_ERROR;
}
-#line 30145 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1669:
-#line 11175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->select_lex.table_list.elements > 1)
@@ -30164,49 +30160,49 @@ yyreduce:
*/
Select->set_lock_for_tables((yyvsp[-4].lock_type));
}
-#line 30168 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30164 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1670:
-#line 11193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30174 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30170 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1673:
-#line 11203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_item_to_list(thd, (yyvsp[-2].item)) || add_value_to_list(thd, (yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 30183 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30179 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1676:
-#line 11216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11212 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->update_list.push_back((yyvsp[-2].item)) ||
lex->value_list.push_back((yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 30194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1677:
-#line 11225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
-#line 30200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30196 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1678:
-#line 11226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 30206 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30202 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1679:
-#line 11233 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11229 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_DELETE;
@@ -30217,11 +30213,11 @@ yyreduce:
lex->ignore= 0;
lex->select_lex.init_order();
}
-#line 30221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30217 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1681:
-#line 11248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!Select->add_table_to_list(thd, (yyvsp[0].table), NULL, TL_OPTION_UPDATING,
YYPS->m_lock_type,
@@ -30230,55 +30226,55 @@ yyreduce:
YYPS->m_lock_type= TL_READ_DEFAULT;
YYPS->m_mdl_type= MDL_SHARED_READ;
}
-#line 30234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1682:
-#line 11257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30236 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1683:
-#line 11259 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
mysql_init_multi_delete(Lex);
YYPS->m_lock_type= TL_READ_DEFAULT;
YYPS->m_mdl_type= MDL_SHARED_READ;
}
-#line 30250 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1684:
-#line 11265 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11261 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (multi_delete_set_locks_and_link_aux_tables(Lex))
MYSQL_YYABORT;
}
-#line 30259 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30255 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1685:
-#line 11270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11266 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
mysql_init_multi_delete(Lex);
YYPS->m_lock_type= TL_READ_DEFAULT;
YYPS->m_mdl_type= MDL_SHARED_READ;
}
-#line 30269 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30265 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1686:
-#line 11276 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11272 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (multi_delete_set_locks_and_link_aux_tables(Lex))
MYSQL_YYABORT;
}
-#line 30278 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30274 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1689:
-#line 11289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Table_ident *ti= new Table_ident((yyvsp[-1].lex_str));
if (ti == NULL)
@@ -30291,11 +30287,11 @@ yyreduce:
YYPS->m_mdl_type))
MYSQL_YYABORT;
}
-#line 30295 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30291 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1690:
-#line 11302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Table_ident *ti= new Table_ident(thd, (yyvsp[-3].lex_str), (yyvsp[-1].lex_str), 0);
if (ti == NULL)
@@ -30308,53 +30304,53 @@ yyreduce:
YYPS->m_mdl_type))
MYSQL_YYABORT;
}
-#line 30312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30308 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1691:
-#line 11317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11313 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1692:
-#line 11318 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30320 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1693:
-#line 11322 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11318 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30326 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1694:
-#line 11323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 30336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30332 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1695:
-#line 11327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= OPTION_QUICK; }
-#line 30342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30338 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1696:
-#line 11328 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11324 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; }
-#line 30348 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30344 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1697:
-#line 11329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= 1; }
-#line 30354 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30350 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1698:
-#line 11334 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11330 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= Lex;
lex->sql_command= SQLCOM_TRUNCATE;
@@ -30365,11 +30361,11 @@ yyreduce:
YYPS->m_lock_type= TL_WRITE;
YYPS->m_mdl_type= MDL_EXCLUSIVE;
}
-#line 30369 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1699:
-#line 11345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11341 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX* lex= thd->lex;
DBUG_ASSERT(!lex->m_stmt);
@@ -30377,99 +30373,99 @@ yyreduce:
if (lex->m_stmt == NULL)
MYSQL_YYABORT;
}
-#line 30381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1706:
-#line 11369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11365 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_CPU;
}
-#line 30389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30385 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1707:
-#line 11373 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_MEMORY;
}
-#line 30397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1708:
-#line 11377 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11373 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_BLOCK_IO;
}
-#line 30405 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1709:
-#line 11381 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11377 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_CONTEXT;
}
-#line 30413 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30409 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1710:
-#line 11385 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11381 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_PAGE_FAULTS;
}
-#line 30421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30417 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1711:
-#line 11389 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11385 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_IPC;
}
-#line 30429 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1712:
-#line 11393 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11389 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_SWAPS;
}
-#line 30437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30433 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1713:
-#line 11397 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11393 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_SOURCE;
}
-#line 30445 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1714:
-#line 11401 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11397 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_options|= PROFILE_ALL;
}
-#line 30453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30449 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1715:
-#line 11408 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11404 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_query_id= 0;
}
-#line 30461 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30457 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1716:
-#line 11412 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11408 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->profile_query_id= atoi((yyvsp[0].lex_str).str);
}
-#line 30469 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30465 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1717:
-#line 11421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11417 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->wild=0;
@@ -30477,30 +30473,30 @@ yyreduce:
lex->current_select->parsing_place= SELECT_LIST;
bzero((char*) &lex->create_info,sizeof(lex->create_info));
}
-#line 30481 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1718:
-#line 11429 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11425 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 30489 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1719:
-#line 11436 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11432 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_DATABASES;
if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA))
MYSQL_YYABORT;
}
-#line 30500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30496 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1720:
-#line 11443 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11439 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_TABLES;
@@ -30508,11 +30504,11 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES))
MYSQL_YYABORT;
}
-#line 30512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30508 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1721:
-#line 11451 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11447 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_TRIGGERS;
@@ -30520,11 +30516,11 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS))
MYSQL_YYABORT;
}
-#line 30524 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30520 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1722:
-#line 11459 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11455 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_EVENTS;
@@ -30532,11 +30528,11 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_EVENTS))
MYSQL_YYABORT;
}
-#line 30536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1723:
-#line 11467 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11463 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
@@ -30544,11 +30540,11 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_TABLES))
MYSQL_YYABORT;
}
-#line 30548 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30544 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1724:
-#line 11475 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11471 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
@@ -30556,34 +30552,34 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES))
MYSQL_YYABORT;
}
-#line 30560 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1725:
-#line 11483 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11479 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_PLUGINS;
if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS))
MYSQL_YYABORT;
}
-#line 30571 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30567 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1726:
-#line 11490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11486 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_info.db_type= (yyvsp[-1].db_type); }
-#line 30577 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30573 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1727:
-#line 11492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11488 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_info.db_type= NULL; }
-#line 30583 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1728:
-#line 11494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_FIELDS;
@@ -30592,45 +30588,45 @@ yyreduce:
if (prepare_schema_table(thd, lex, (yyvsp[-2].table), SCH_COLUMNS))
MYSQL_YYABORT;
}
-#line 30596 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30592 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1729:
-#line 11503 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11499 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_SHOW_BINLOGS;
}
-#line 30604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1730:
-#line 11507 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11503 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS;
}
-#line 30612 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1731:
-#line 11511 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11507 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
}
-#line 30621 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30617 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1733:
-#line 11516 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11512 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS;
}
-#line 30630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1735:
-#line 11521 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11517 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_KEYS;
@@ -30639,22 +30635,22 @@ yyreduce:
if (prepare_schema_table(thd, lex, (yyvsp[-2].table), SCH_STATISTICS))
MYSQL_YYABORT;
}
-#line 30643 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30639 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1736:
-#line 11530 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11526 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
if (prepare_schema_table(thd, lex, 0, SCH_ENGINES))
MYSQL_YYABORT;
}
-#line 30654 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30650 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1737:
-#line 11537 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11533 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_AUTHORS;
@@ -30663,11 +30659,11 @@ yyreduce:
ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
"SHOW AUTHORS");
}
-#line 30667 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1738:
-#line 11546 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11542 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
@@ -30676,61 +30672,61 @@ yyreduce:
ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
"SHOW CONTRIBUTORS");
}
-#line 30680 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1739:
-#line 11555 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11551 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_PRIVILEGES;
}
-#line 30689 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30685 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1740:
-#line 11560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11556 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (void) create_select_for_variable("warning_count"); }
-#line 30695 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30691 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1741:
-#line 11562 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11558 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (void) create_select_for_variable("error_count"); }
-#line 30701 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30697 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1742:
-#line 11564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11560 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command = SQLCOM_SHOW_WARNS;}
-#line 30707 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30703 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1743:
-#line 11566 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11562 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command = SQLCOM_SHOW_ERRORS;}
-#line 30713 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30709 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1744:
-#line 11568 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command = SQLCOM_SHOW_PROFILES; }
-#line 30719 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30715 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1745:
-#line 11570 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11566 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_PROFILE;
if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0)
YYABORT;
}
-#line 30730 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1746:
-#line 11577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_STATUS;
@@ -30738,17 +30734,17 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_STATUS))
MYSQL_YYABORT;
}
-#line 30742 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30738 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1747:
-#line 11585 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11581 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
-#line 30748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1748:
-#line 11587 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11583 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_VARIABLES;
@@ -30756,33 +30752,33 @@ yyreduce:
if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES))
MYSQL_YYABORT;
}
-#line 30760 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30756 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1749:
-#line 11595 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11591 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_CHARSETS;
if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS))
MYSQL_YYABORT;
}
-#line 30771 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30767 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1750:
-#line 11602 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11598 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_COLLATIONS;
if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS))
MYSQL_YYABORT;
}
-#line 30782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1751:
-#line 11609 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11605 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -30792,32 +30788,32 @@ yyreduce:
bzero(curr_user, sizeof(st_lex_user));
lex->grant_user= curr_user;
}
-#line 30796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1752:
-#line 11619 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11615 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_GRANTS;
lex->grant_user=(yyvsp[0].lex_user);
lex->grant_user->password=null_lex_str;
}
-#line 30807 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30803 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1753:
-#line 11626 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11622 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
Lex->create_info.options=(yyvsp[-1].num);
Lex->name= (yyvsp[0].lex_str);
}
-#line 30817 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30813 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1754:
-#line 11632 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11628 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -30825,11 +30821,11 @@ yyreduce:
MYSQL_YYABORT;
lex->create_info.storage_media= HA_SM_DEFAULT;
}
-#line 30829 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30825 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1755:
-#line 11640 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11636 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -30837,239 +30833,239 @@ yyreduce:
MYSQL_YYABORT;
lex->only_view= 1;
}
-#line 30841 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30837 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1756:
-#line 11648 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11644 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
}
-#line 30849 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30845 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1757:
-#line 11652 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11648 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}
-#line 30857 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30853 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1758:
-#line 11656 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11652 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_CLIENT_STATS;
if (prepare_schema_table(thd, lex, 0, SCH_CLIENT_STATS))
MYSQL_YYABORT;
}
-#line 30868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1759:
-#line 11663 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11659 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_USER_STATS;
if (prepare_schema_table(thd, lex, 0, SCH_USER_STATS))
MYSQL_YYABORT;
}
-#line 30879 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30875 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1760:
-#line 11670 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11666 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_TABLE_STATS;
if (prepare_schema_table(thd, lex, 0, SCH_TABLE_STATS))
MYSQL_YYABORT;
}
-#line 30890 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30886 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1761:
-#line 11677 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11673 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_INDEX_STATS;
if (prepare_schema_table(thd, lex, 0, SCH_INDEX_STATS))
MYSQL_YYABORT;
}
-#line 30901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1762:
-#line 11684 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE_PROC;
lex->spname= (yyvsp[0].spname);
}
-#line 30912 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30908 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1763:
-#line 11691 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11687 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE_FUNC;
lex->spname= (yyvsp[0].spname);
}
-#line 30923 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30919 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1764:
-#line 11698 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11694 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER;
lex->spname= (yyvsp[0].spname);
}
-#line 30933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30929 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1765:
-#line 11704 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11700 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
MYSQL_YYABORT;
}
-#line 30944 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30940 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1766:
-#line 11711 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11707 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES))
MYSQL_YYABORT;
}
-#line 30955 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30951 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1767:
-#line 11718 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11714 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command= SQLCOM_SHOW_PROC_CODE;
Lex->spname= (yyvsp[0].spname);
}
-#line 30964 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30960 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1768:
-#line 11723 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11719 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command= SQLCOM_SHOW_FUNC_CODE;
Lex->spname= (yyvsp[0].spname);
}
-#line 30973 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1769:
-#line 11728 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11724 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->spname= (yyvsp[0].spname);
Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT;
}
-#line 30982 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30978 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1770:
-#line 11736 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11732 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
-#line 30988 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30984 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1771:
-#line 11738 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11734 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
-#line 30994 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30990 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1772:
-#line 11740 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11736 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
-#line 31000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 30996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1777:
-#line 11754 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11750 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.simple_string)= 0; }
-#line 31006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1778:
-#line 11755 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11751 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.simple_string)= (yyvsp[0].lex_str).str; }
-#line 31012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1779:
-#line 11759 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11755 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->verbose=0; }
-#line 31018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31014 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1780:
-#line 11760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11756 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->verbose=1; }
-#line 31024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31020 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1783:
-#line 11769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11765 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->mi.log_file_name = 0; }
-#line 31030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1784:
-#line 11770 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11766 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->mi.log_file_name = (yyvsp[0].lex_str).str; }
-#line 31036 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31032 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1785:
-#line 11774 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11770 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->mi.pos = 4; /* skip magic number */ }
-#line 31042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1786:
-#line 11775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11771 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->mi.pos = (yyvsp[0].ulonglong_number); }
-#line 31048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31044 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1788:
-#line 11781 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11777 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->wild= new (thd->mem_root) String((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length,
system_charset_info);
if (Lex->wild == NULL)
MYSQL_YYABORT;
}
-#line 31059 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31055 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1789:
-#line 11788 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11784 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->where= normalize_cond((yyvsp[0].item));
if ((yyvsp[0].item))
(yyvsp[0].item)->top_level_item();
}
-#line 31069 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31065 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1790:
-#line 11798 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11794 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
mysql_init_select(lex);
@@ -31080,64 +31076,64 @@ yyreduce:
if (prepare_schema_table(thd, lex, (yyvsp[0].table), SCH_COLUMNS))
MYSQL_YYABORT;
}
-#line 31084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31080 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1791:
-#line 11809 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11805 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Select->parsing_place= NO_MATTER;
}
-#line 31092 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31088 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1792:
-#line 11813 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11809 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->describe|= DESCRIBE_NORMAL; }
-#line 31098 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31094 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1793:
-#line 11815 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11811 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->select_lex.options|= SELECT_DESCRIBE;
}
-#line 31107 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31103 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1796:
-#line 11827 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11823 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31113 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31109 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1797:
-#line 11828 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11824 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->describe|= DESCRIBE_EXTENDED; }
-#line 31119 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31115 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1798:
-#line 11829 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11825 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->describe|= DESCRIBE_PARTITIONS; }
-#line 31125 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31121 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1799:
-#line 11833 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11829 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1800:
-#line 11834 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11830 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->wild= (yyvsp[0].string); }
-#line 31137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31133 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1801:
-#line 11836 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11832 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->wild= new (thd->mem_root) String((const char*) (yyvsp[0].lex_str).str,
(yyvsp[0].lex_str).length,
@@ -31145,28 +31141,28 @@ yyreduce:
if (Lex->wild == NULL)
MYSQL_YYABORT;
}
-#line 31149 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31145 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1802:
-#line 11850 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11846 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_FLUSH;
lex->type= 0;
lex->no_write_to_binlog= (yyvsp[0].num);
}
-#line 31160 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1803:
-#line 11857 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11853 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31166 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1804:
-#line 11862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11858 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->type|= REFRESH_TABLES;
/*
@@ -31176,29 +31172,29 @@ yyreduce:
YYPS->m_lock_type= TL_READ_NO_INSERT;
YYPS->m_mdl_type= MDL_SHARED_HIGH_PRIO;
}
-#line 31180 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31176 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1805:
-#line 11871 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11867 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1806:
-#line 11872 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11868 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1808:
-#line 11877 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11873 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1809:
-#line 11879 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11875 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
TABLE_LIST *tables= Lex->query_tables;
Lex->type|= REFRESH_READ_LOCK | (yyvsp[0].num);
@@ -31209,327 +31205,327 @@ yyreduce:
tables->open_type= OT_BASE_ONLY; /* Ignore temporary tables. */
}
}
-#line 31213 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31209 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1811:
-#line 11894 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31219 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31215 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1812:
-#line 11899 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11895 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_ERROR_LOG; }
-#line 31225 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1813:
-#line 11901 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11897 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_ENGINE_LOG; }
-#line 31231 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31227 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1814:
-#line 11903 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11899 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_GENERAL_LOG; }
-#line 31237 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31233 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1815:
-#line 11905 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11901 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_SLOW_LOG; }
-#line 31243 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31239 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1816:
-#line 11907 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11903 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_BINARY_LOG; }
-#line 31249 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31245 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1817:
-#line 11909 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11905 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_RELAY_LOG; }
-#line 31255 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31251 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1818:
-#line 11911 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11907 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_QUERY_CACHE_FREE; }
-#line 31261 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31257 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1819:
-#line 11913 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11909 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_HOSTS; }
-#line 31267 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31263 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1820:
-#line 11915 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11911 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_GRANT; }
-#line 31273 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31269 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1821:
-#line 11917 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11913 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_LOG; }
-#line 31279 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31275 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1822:
-#line 11919 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11915 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_STATUS; }
-#line 31285 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31281 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1823:
-#line 11921 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11917 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->type|= REFRESH_SLAVE;
Lex->reset_slave_info.all= false;
}
-#line 31294 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31290 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1824:
-#line 11926 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11922 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_CLIENT_STATS; }
-#line 31300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31296 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1825:
-#line 11928 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11924 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_USER_STATS; }
-#line 31306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31302 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1826:
-#line 11930 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11926 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_TABLE_STATS; }
-#line 31312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31308 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1827:
-#line 11932 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11928 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_INDEX_STATS; }
-#line 31318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1828:
-#line 11934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11930 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_MASTER; }
-#line 31324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31320 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1829:
-#line 11936 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11932 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_DES_KEY_FILE; }
-#line 31330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31326 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1830:
-#line 11938 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_USER_RESOURCES; }
-#line 31336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31332 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1831:
-#line 11942 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11938 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31338 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1832:
-#line 11943 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11939 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31348 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31344 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1833:
-#line 11947 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11943 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num)= 0;}
-#line 31354 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31350 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1834:
-#line 11948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11944 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.num)= REFRESH_CHECKPOINT; }
-#line 31360 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31356 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1835:
-#line 11952 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RESET; lex->type=0;
}
-#line 31369 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1836:
-#line 11957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31375 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1839:
-#line 11966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11962 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_SLAVE; }
-#line 31381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1840:
-#line 11967 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11963 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 31387 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31383 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1841:
-#line 11968 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11964 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_MASTER; }
-#line 31393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1842:
-#line 11969 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11965 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->type|= REFRESH_QUERY_CACHE;}
-#line 31399 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31395 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1843:
-#line 11973 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11969 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->reset_slave_info.all= false; }
-#line 31405 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1844:
-#line 11974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->reset_slave_info.all= true; }
-#line 31411 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31407 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1845:
-#line 11979 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11975 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->type=0;
lex->sql_command = SQLCOM_PURGE;
}
-#line 31421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31417 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1846:
-#line 11985 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11981 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31427 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31423 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1848:
-#line 11994 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11990 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->to_log = (yyvsp[0].lex_str).str;
}
-#line 31435 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1849:
-#line 11998 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 11994 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->value_list.empty();
lex->value_list.push_front((yyvsp[0].item));
lex->sql_command= SQLCOM_PURGE_BEFORE;
}
-#line 31446 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31442 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1850:
-#line 12010 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12006 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->value_list.empty();
lex->users_list.empty();
lex->sql_command= SQLCOM_KILL;
}
-#line 31457 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1851:
-#line 12017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12013 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->kill_signal= (killed_state) ((yyvsp[-2].num) | (yyvsp[-1].num));
}
-#line 31465 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31461 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1852:
-#line 12023 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12019 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (int) KILL_HARD_BIT; }
-#line 31471 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31467 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1853:
-#line 12024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12020 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (int) KILL_HARD_BIT; }
-#line 31477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31473 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1854:
-#line 12025 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 31483 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31479 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1855:
-#line 12028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (int) KILL_CONNECTION; }
-#line 31489 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1856:
-#line 12029 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12025 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (int) KILL_CONNECTION; }
-#line 31495 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1857:
-#line 12030 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= (int) KILL_QUERY; }
-#line 31501 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1858:
-#line 12035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->value_list.push_front((yyval.item));
Lex->kill_type= KILL_TYPE_ID;
}
-#line 31510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1859:
-#line 12040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->users_list.push_back((yyvsp[0].lex_user));
Lex->kill_type= KILL_TYPE_USER;
}
-#line 31519 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31515 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1860:
-#line 12050 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12046 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_CHANGE_DB;
lex->select_lex.db= (yyvsp[0].lex_str).str;
}
-#line 31529 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31525 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1861:
-#line 12061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
@@ -31540,11 +31536,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 31544 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1862:
-#line 12072 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12068 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_LOAD;
@@ -31554,11 +31550,11 @@ yyreduce:
if (!(lex->exchange= new sql_exchange((yyvsp[0].lex_str).str, 0, (yyvsp[-5].filetype))))
MYSQL_YYABORT;
}
-#line 31558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31554 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1863:
-#line 12082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!Select->add_table_to_list(thd, (yyvsp[0].table), NULL, TL_OPTION_UPDATING,
@@ -31568,53 +31564,53 @@ yyreduce:
lex->update_list.empty();
lex->value_list.empty();
}
-#line 31572 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31568 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1864:
-#line 12092 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->exchange->cs= (yyvsp[0].charset); }
-#line 31578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31574 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1865:
-#line 12096 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12092 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31584 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31580 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1866:
-#line 12100 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12096 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.filetype)= FILETYPE_CSV; }
-#line 31590 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31586 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1867:
-#line 12101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.filetype)= FILETYPE_XML; }
-#line 31596 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31592 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1868:
-#line 12105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=0;}
-#line 31602 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31598 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1869:
-#line 12106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=1;}
-#line 31608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1870:
-#line 12110 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
-#line 31614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1871:
-#line 12112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Ignore this option in SP to avoid problem with query cache and
@@ -31622,182 +31618,182 @@ yyreduce:
*/
(yyval.lock_type)= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT);
}
-#line 31626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31622 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1872:
-#line 12119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
-#line 31632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31628 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1873:
-#line 12123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->duplicates=DUP_ERROR; }
-#line 31638 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31634 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1874:
-#line 12124 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12120 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->duplicates=DUP_REPLACE; }
-#line 31644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31640 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1875:
-#line 12125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ignore= 1; }
-#line 31650 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31646 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1880:
-#line 12140 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->field_term= (yyvsp[0].string);
}
-#line 31659 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31655 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1881:
-#line 12145 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
DBUG_ASSERT(lex->exchange != 0);
lex->exchange->enclosed= (yyvsp[0].string);
lex->exchange->opt_enclosed= 1;
}
-#line 31670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31666 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1882:
-#line 12152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12148 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->enclosed= (yyvsp[0].string);
}
-#line 31679 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31675 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1883:
-#line 12157 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12153 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->escaped= (yyvsp[0].string);
}
-#line 31688 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31684 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1888:
-#line 12175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_term= (yyvsp[0].string);
}
-#line 31697 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31693 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1889:
-#line 12180 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12176 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_start= (yyvsp[0].string);
}
-#line 31706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1890:
-#line 12187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 31712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31708 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1891:
-#line 12189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->exchange->line_term = (yyvsp[0].string); }
-#line 31718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1893:
-#line 12194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->skip_lines= atol((yyvsp[-1].lex_str).str);
}
-#line 31727 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31723 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1894:
-#line 12201 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 31733 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31729 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1895:
-#line 12203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 31739 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31735 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1896:
-#line 12207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31745 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31741 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1897:
-#line 12208 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31751 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31747 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1898:
-#line 12209 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12205 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31757 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31753 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1899:
-#line 12214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->field_list.push_back((yyvsp[0].item)); }
-#line 31763 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31759 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1900:
-#line 12216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12212 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->field_list.push_back((yyvsp[0].item)); }
-#line 31769 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31765 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1901:
-#line 12220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{(yyval.item)= (yyvsp[0].item);}
-#line 31775 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31771 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1902:
-#line 12222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_user_var_as_out_param((yyvsp[0].lex_str));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 31785 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31781 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1903:
-#line 12230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31791 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31787 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1904:
-#line 12231 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12227 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 31797 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31793 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1907:
-#line 12241 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12237 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->update_list.push_back((yyvsp[-4].item)) ||
@@ -31805,11 +31801,11 @@ yyreduce:
MYSQL_YYABORT;
(yyvsp[-1].item)->set_name_no_truncate((yyvsp[-2].simple_string), (uint) ((yyvsp[0].simple_string) - (yyvsp[-2].simple_string)), thd->charset());
}
-#line 31809 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31805 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1908:
-#line 12254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX_STRING tmp;
CHARSET_INFO *cs_con= thd->variables.collation_connection;
@@ -31832,11 +31828,11 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 31836 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1909:
-#line 12277 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12273 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
uint repertoire= Lex->text_string_is_7bit ?
MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
@@ -31848,11 +31844,11 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 31852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31848 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1910:
-#line 12289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_string *str= new (thd->mem_root) Item_string((yyvsp[0].lex_str).str,
(yyvsp[0].lex_str).length, (yyvsp[-1].charset));
@@ -31863,11 +31859,11 @@ yyreduce:
(yyval.item)= str;
}
-#line 31867 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31863 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1911:
-#line 12300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_string* item= (Item_string*) (yyvsp[-1].item);
item->append((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
@@ -31883,11 +31879,11 @@ yyreduce:
(yyvsp[0].lex_str).length);
}
}
-#line 31887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1912:
-#line 12319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.string)= new (thd->mem_root) String((yyvsp[0].lex_str).str,
(yyvsp[0].lex_str).length,
@@ -31895,11 +31891,11 @@ yyreduce:
if ((yyval.string) == NULL)
MYSQL_YYABORT;
}
-#line 31899 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31895 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1913:
-#line 12327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *tmp= new (thd->mem_root) Item_hex_hybrid((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (tmp == NULL)
@@ -31911,11 +31907,11 @@ yyreduce:
tmp->quick_fix_field();
(yyval.string)= tmp->val_str((String*) 0);
}
-#line 31915 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31911 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1914:
-#line 12339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *tmp= new (thd->mem_root) Item_hex_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (tmp == NULL)
@@ -31923,11 +31919,11 @@ yyreduce:
tmp->quick_fix_field();
(yyval.string)= tmp->val_str((String*) 0);
}
-#line 31927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31923 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1915:
-#line 12347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *tmp= new (thd->mem_root) Item_bin_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (tmp == NULL)
@@ -31939,11 +31935,11 @@ yyreduce:
tmp->quick_fix_field();
(yyval.string)= tmp->val_str((String*) 0);
}
-#line 31943 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1916:
-#line 12362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -31960,105 +31956,105 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 31964 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31960 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1917:
-#line 12381 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12377 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item); }
-#line 31970 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31966 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1918:
-#line 12382 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12378 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item_num); }
-#line 31976 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31972 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1919:
-#line 12384 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12380 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyvsp[0].item_num)->max_length++;
(yyval.item)= (yyvsp[0].item_num)->neg();
}
-#line 31985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31981 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1920:
-#line 12391 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12387 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item); }
-#line 31991 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31987 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1921:
-#line 12392 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12388 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item_num); }
-#line 31997 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 31993 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1922:
-#line 12394 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12390 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_null();
if ((yyval.item) == NULL)
MYSQL_YYABORT;
YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT;
}
-#line 32008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1923:
-#line 12401 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12397 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_int((char*) "FALSE",0,1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32014 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1924:
-#line 12407 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_int((char*) "TRUE",1,1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32028 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1925:
-#line 12413 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12409 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_hex_hybrid((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1926:
-#line 12419 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12415 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item) = new (thd->mem_root) Item_hex_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32044 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1927:
-#line 12425 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12421 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)= new (thd->mem_root) Item_bin_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1928:
-#line 12431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *tmp= new (thd->mem_root) Item_hex_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (tmp == NULL)
@@ -32087,11 +32083,11 @@ yyreduce:
(yyval.item)= item_str;
}
-#line 32091 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32087 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1929:
-#line 12460 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12456 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item *tmp= new (thd->mem_root) Item_bin_string((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (tmp == NULL)
@@ -32119,29 +32115,29 @@ yyreduce:
(yyval.item)= item_str;
}
-#line 32123 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32119 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1930:
-#line 12487 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12483 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item); }
-#line 32129 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32125 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1931:
-#line 12488 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12484 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item); }
-#line 32135 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1932:
-#line 12489 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12485 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item) = (yyvsp[0].item); }
-#line 32141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1933:
-#line 12494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
int error;
(yyval.item_num)= new (thd->mem_root)
@@ -32151,11 +32147,11 @@ yyreduce:
if ((yyval.item_num) == NULL)
MYSQL_YYABORT;
}
-#line 32155 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32151 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1934:
-#line 12504 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12500 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
int error;
(yyval.item_num)= new (thd->mem_root)
@@ -32165,21 +32161,21 @@ yyreduce:
if ((yyval.item_num) == NULL)
MYSQL_YYABORT;
}
-#line 32169 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32165 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1935:
-#line 12514 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12510 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_num)= new (thd->mem_root) Item_uint((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if ((yyval.item_num) == NULL)
MYSQL_YYABORT;
}
-#line 32179 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32175 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1936:
-#line 12520 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12516 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_num)= new (thd->mem_root) Item_decimal((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length,
thd->charset());
@@ -32188,11 +32184,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1937:
-#line 12529 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12525 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item_num)= new (thd->mem_root) Item_float((yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (((yyval.item_num) == NULL) || (thd->is_error()))
@@ -32200,23 +32196,23 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32204 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1938:
-#line 12543 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12539 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=(yyvsp[0].item); }
-#line 32210 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32206 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1939:
-#line 12544 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12540 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=(yyvsp[0].item); }
-#line 32216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1940:
-#line 12549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12545 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
(yyval.item)= new (thd->mem_root) Item_field(Lex->current_context(),
@@ -32225,11 +32221,11 @@ yyreduce:
MYSQL_YYABORT;
sel->with_wild++;
}
-#line 32229 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32225 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1941:
-#line 12558 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12554 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel= Select;
const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
@@ -32241,17 +32237,17 @@ yyreduce:
MYSQL_YYABORT;
sel->with_wild++;
}
-#line 32245 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32241 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1942:
-#line 12572 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12568 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=(yyvsp[0].item); }
-#line 32251 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32247 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1943:
-#line 12577 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12573 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -32297,17 +32293,17 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32301 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32297 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1944:
-#line 12622 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12618 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[0].item); }
-#line 32307 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1945:
-#line 12627 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12623 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
SELECT_LEX *sel=Select;
if ((sel->parsing_place != IN_HAVING) ||
@@ -32324,17 +32320,17 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32328 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1946:
-#line 12643 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12639 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)= (yyvsp[0].item); }
-#line 32334 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1947:
-#line 12648 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12644 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
@@ -32412,11 +32408,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32416 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32412 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1948:
-#line 12726 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12722 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
SELECT_LEX *sel= lex->current_select;
@@ -32440,11 +32436,11 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32444 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32440 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1949:
-#line 12750 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12746 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
SELECT_LEX *sel= lex->current_select;
@@ -32471,17 +32467,17 @@ yyreduce:
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 32475 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32471 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1950:
-#line 12779 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12775 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str);}
-#line 32481 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1951:
-#line 12781 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12777 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
TABLE_LIST *table= Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[-4].lex_str).str, table->db))
@@ -32497,11 +32493,11 @@ yyreduce:
}
(yyval.lex_str)=(yyvsp[0].lex_str);
}
-#line 32501 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1952:
-#line 12797 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12793 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
TABLE_LIST *table= Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[-2].lex_str).str, table->alias))
@@ -32511,85 +32507,85 @@ yyreduce:
}
(yyval.lex_str)=(yyvsp[0].lex_str);
}
-#line 32515 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32511 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1953:
-#line 12806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str);}
-#line 32521 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32517 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1954:
-#line 12811 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12807 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.table)= new Table_ident((yyvsp[0].lex_str));
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32531 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32527 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1955:
-#line 12817 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12813 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.table)= new Table_ident(thd, (yyvsp[-2].lex_str),(yyvsp[0].lex_str),0);
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32541 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32537 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1956:
-#line 12823 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12819 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/* For Delphi */
(yyval.table)= new Table_ident((yyvsp[0].lex_str));
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32548 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1957:
-#line 12833 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12829 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.table)= new Table_ident((yyvsp[-1].lex_str));
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32562 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1958:
-#line 12839 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12835 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.table)= new Table_ident(thd, (yyvsp[-3].lex_str),(yyvsp[-1].lex_str),0);
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32572 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32568 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1959:
-#line 12848 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12844 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX_STRING db={(char*) any_db,3};
(yyval.table)= new Table_ident(thd, db,(yyvsp[0].lex_str),0);
if ((yyval.table) == NULL)
MYSQL_YYABORT;
}
-#line 32583 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1960:
-#line 12857 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12853 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)= (yyvsp[0].lex_str); }
-#line 32589 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32585 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1961:
-#line 12859 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12855 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (thd->charset_is_system_charset)
{
@@ -32614,11 +32610,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1962:
-#line 12887 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12883 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (thd->charset_is_system_charset)
(yyval.lex_str)= (yyvsp[0].lex_str);
@@ -32629,11 +32625,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32633 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32629 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1963:
-#line 12901 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12897 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (thd->charset_is_collation_connection)
(yyval.lex_str)= (yyvsp[0].lex_str);
@@ -32644,11 +32640,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1964:
-#line 12915 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12911 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (thd->charset_is_character_set_filesystem)
(yyval.lex_str)= (yyvsp[0].lex_str);
@@ -32660,63 +32656,63 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 32664 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32660 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1965:
-#line 12929 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12925 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 32670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32666 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1966:
-#line 12931 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12927 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_str).str= thd->strmake((yyvsp[0].symbol).str, (yyvsp[0].symbol).length);
if ((yyval.lex_str).str == NULL)
MYSQL_YYABORT;
(yyval.lex_str).length= (yyvsp[0].symbol).length;
}
-#line 32681 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32677 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1967:
-#line 12940 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12936 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str); }
-#line 32687 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32683 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1968:
-#line 12942 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12938 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_str).str= thd->strmake((yyvsp[0].symbol).str, (yyvsp[0].symbol).length);
if ((yyval.lex_str).str == NULL)
MYSQL_YYABORT;
(yyval.lex_str).length= (yyvsp[0].symbol).length;
}
-#line 32698 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1969:
-#line 12951 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12947 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str);}
-#line 32704 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32700 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1970:
-#line 12952 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str);}
-#line 32710 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1971:
-#line 12953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12949 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_str)=(yyvsp[0].lex_str);}
-#line 32716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1972:
-#line 12958 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12954 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -32732,11 +32728,11 @@ yyreduce:
system_charset_info, 0))
MYSQL_YYABORT;
}
-#line 32736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1973:
-#line 12974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -32757,11 +32753,11 @@ yyreduce:
*/
my_casedn_str(system_charset_info, (yyval.lex_user)->host.str);
}
-#line 32761 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32757 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1974:
-#line 12995 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 12991 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -32772,2123 +32768,2123 @@ yyreduce:
*/
bzero((yyval.lex_user), sizeof(LEX_USER));
}
-#line 32776 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32772 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1975:
-#line 13009 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13005 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1976:
-#line 13010 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13006 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32784 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1977:
-#line 13011 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13007 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32790 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1978:
-#line 13012 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13008 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1979:
-#line 13013 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13009 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32802 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1980:
-#line 13014 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13010 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32812 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32808 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1981:
-#line 13015 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13011 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1982:
-#line 13016 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13012 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32824 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32820 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1983:
-#line 13017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13013 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32830 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32826 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1984:
-#line 13018 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13014 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32836 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1985:
-#line 13019 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13015 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32842 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1986:
-#line 13020 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13016 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32848 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32844 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1987:
-#line 13021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13017 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32854 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32850 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1988:
-#line 13022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13018 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32860 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32856 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1989:
-#line 13023 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13019 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32866 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32862 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1990:
-#line 13024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13020 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32872 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1991:
-#line 13025 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13021 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32878 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32874 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1992:
-#line 13026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32884 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32880 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1993:
-#line 13027 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13023 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32890 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32886 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1994:
-#line 13028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13024 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32896 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32892 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1995:
-#line 13029 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13025 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32902 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1996:
-#line 13030 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13026 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32908 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32904 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1997:
-#line 13031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13027 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32914 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1998:
-#line 13032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32920 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 1999:
-#line 13033 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13029 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32926 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32922 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2000:
-#line 13034 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13030 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32932 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32928 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2001:
-#line 13035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32938 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32934 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2002:
-#line 13036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32944 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32940 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2003:
-#line 13037 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13033 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32950 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32946 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2004:
-#line 13038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13034 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32956 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32952 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2005:
-#line 13039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13035 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32962 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32958 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2006:
-#line 13040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32968 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32964 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2007:
-#line 13041 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13037 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32974 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32970 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2008:
-#line 13042 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32980 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32976 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2009:
-#line 13043 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13039 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32986 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32982 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2010:
-#line 13044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32992 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32988 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2011:
-#line 13045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13041 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 32998 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 32994 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2012:
-#line 13046 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13042 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33004 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2013:
-#line 13047 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13043 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33010 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2014:
-#line 13048 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13044 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33016 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2015:
-#line 13049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33022 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2016:
-#line 13050 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13046 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33028 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2017:
-#line 13051 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13047 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33034 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2018:
-#line 13052 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13048 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33040 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33036 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2019:
-#line 13053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13049 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33046 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2020:
-#line 13054 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13050 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33052 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2021:
-#line 13055 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13051 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33058 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2022:
-#line 13056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13052 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33064 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33060 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2023:
-#line 13057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33070 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33066 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2024:
-#line 13058 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13054 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33076 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33072 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2025:
-#line 13059 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13055 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33082 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2026:
-#line 13060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13056 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33088 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2027:
-#line 13061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33094 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2028:
-#line 13062 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13058 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33100 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33096 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2029:
-#line 13063 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13059 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33106 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33102 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2030:
-#line 13064 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13060 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33112 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33108 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2031:
-#line 13065 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13061 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33118 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33114 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2032:
-#line 13066 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13062 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33124 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33120 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2033:
-#line 13067 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13063 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33130 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33126 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2034:
-#line 13077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13073 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33136 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33132 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2035:
-#line 13078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13074 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33142 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33138 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2036:
-#line 13079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13075 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33148 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33144 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2037:
-#line 13080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13076 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33154 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33150 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2038:
-#line 13081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13077 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33160 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2039:
-#line 13082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33166 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2040:
-#line 13083 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13079 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33172 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33168 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2041:
-#line 13084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33178 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33174 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2042:
-#line 13085 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13081 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33184 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33180 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2043:
-#line 13086 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2044:
-#line 13087 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13083 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33196 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2045:
-#line 13088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33202 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2046:
-#line 13089 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13085 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33208 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33204 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2047:
-#line 13090 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13086 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33214 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33210 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2048:
-#line 13091 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13087 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33220 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2049:
-#line 13092 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13088 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33226 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33222 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2050:
-#line 13093 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13089 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33232 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33228 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2051:
-#line 13094 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13090 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33238 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2052:
-#line 13095 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13091 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33244 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2053:
-#line 13096 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13092 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33250 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2054:
-#line 13097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13093 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33256 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33252 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2055:
-#line 13098 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13094 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33262 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33258 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2056:
-#line 13099 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13095 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33268 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2057:
-#line 13100 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13096 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33274 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2058:
-#line 13101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13097 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33280 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33276 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2059:
-#line 13102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13098 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33286 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33282 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2060:
-#line 13103 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13099 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33292 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33288 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2061:
-#line 13104 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13100 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33298 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33294 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2062:
-#line 13105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33304 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2063:
-#line 13106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33310 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2064:
-#line 13107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13103 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33316 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2065:
-#line 13108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13104 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33322 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2066:
-#line 13109 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33328 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2067:
-#line 13110 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33334 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2068:
-#line 13111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33340 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2069:
-#line 13112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33346 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2070:
-#line 13113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13109 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33352 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33348 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2071:
-#line 13114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13110 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33358 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33354 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2072:
-#line 13115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33364 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33360 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2073:
-#line 13116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33370 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33366 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2074:
-#line 13117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33376 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33372 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2075:
-#line 13118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33382 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33378 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2076:
-#line 13119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33388 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33384 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2077:
-#line 13120 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33394 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33390 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2078:
-#line 13121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33400 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33396 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2079:
-#line 13122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33406 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33402 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2080:
-#line 13123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33412 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33408 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2081:
-#line 13124 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13120 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33418 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33414 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2082:
-#line 13125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33424 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33420 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2083:
-#line 13126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33430 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2084:
-#line 13127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33436 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33432 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2085:
-#line 13128 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13124 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33442 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33438 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2086:
-#line 13129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33448 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33444 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2087:
-#line 13130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33454 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33450 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2088:
-#line 13131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33460 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2089:
-#line 13132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13128 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33466 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2090:
-#line 13133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33472 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33468 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2091:
-#line 13134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33478 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33474 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2092:
-#line 13135 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33484 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33480 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2093:
-#line 13136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33490 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2094:
-#line 13137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33496 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2095:
-#line 13138 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33502 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33498 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2096:
-#line 13139 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13135 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33508 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2097:
-#line 13140 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33514 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2098:
-#line 13141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33520 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2099:
-#line 13142 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13138 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2100:
-#line 13143 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13139 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33528 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2101:
-#line 13144 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13140 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33538 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33534 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2102:
-#line 13145 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13141 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33544 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2103:
-#line 13146 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13142 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33550 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2104:
-#line 13147 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13143 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2105:
-#line 13148 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13144 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33562 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2106:
-#line 13149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13145 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33568 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33564 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2107:
-#line 13150 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13146 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33574 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33570 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2108:
-#line 13151 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13147 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33580 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33576 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2109:
-#line 13152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13148 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33586 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2110:
-#line 13153 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33592 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33588 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2111:
-#line 13154 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13150 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33598 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2112:
-#line 13155 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13151 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33604 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2113:
-#line 13156 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13152 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2114:
-#line 13157 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13153 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33616 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33612 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2115:
-#line 13158 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13154 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33622 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2116:
-#line 13159 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13155 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33628 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33624 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2117:
-#line 13160 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13156 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33634 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2118:
-#line 13161 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13157 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33640 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33636 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2119:
-#line 13162 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13158 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33646 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33642 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2120:
-#line 13163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13159 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33652 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2121:
-#line 13164 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13160 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33658 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33654 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2122:
-#line 13165 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13161 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33664 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33660 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2123:
-#line 13166 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13162 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33666 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2124:
-#line 13167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2125:
-#line 13168 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13164 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2126:
-#line 13169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13165 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33688 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33684 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2127:
-#line 13170 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13166 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2128:
-#line 13171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13167 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33700 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33696 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2129:
-#line 13172 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13168 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2130:
-#line 13173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33708 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2131:
-#line 13174 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13170 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2132:
-#line 13175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13171 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33724 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2133:
-#line 13176 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13172 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33730 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2134:
-#line 13177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2135:
-#line 13178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13174 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33742 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33738 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2136:
-#line 13179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13175 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2137:
-#line 13180 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13176 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33754 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2138:
-#line 13181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13177 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33760 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33756 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2139:
-#line 13182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13178 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33766 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33762 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2140:
-#line 13183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13179 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33772 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33768 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2141:
-#line 13184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13180 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33774 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2142:
-#line 13185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13181 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33784 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33780 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2143:
-#line 13186 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33790 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33786 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2144:
-#line 13187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2145:
-#line 13188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13184 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33802 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33798 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2146:
-#line 13189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13185 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33808 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33804 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2147:
-#line 13190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13186 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2148:
-#line 13191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33820 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33816 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2149:
-#line 13192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13188 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33826 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33822 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2150:
-#line 13193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13189 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33832 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2151:
-#line 13194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13190 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2152:
-#line 13195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33844 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33840 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2153:
-#line 13196 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13192 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33850 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33846 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2154:
-#line 13197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13193 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33856 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2155:
-#line 13198 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13194 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33862 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2156:
-#line 13199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2157:
-#line 13200 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13196 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33874 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33870 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2158:
-#line 13201 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33880 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33876 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2159:
-#line 13202 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13198 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33886 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33882 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2160:
-#line 13203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33892 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33888 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2161:
-#line 13204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13200 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33894 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2162:
-#line 13205 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13201 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33904 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33900 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2163:
-#line 13206 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13202 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33906 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2164:
-#line 13207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33912 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2165:
-#line 13208 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13204 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33922 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33918 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2166:
-#line 13209 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13205 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33928 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33924 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2167:
-#line 13210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13206 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33934 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33930 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2168:
-#line 13211 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33940 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33936 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2169:
-#line 13212 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13208 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33946 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33942 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2170:
-#line 13213 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13209 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33952 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33948 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2171:
-#line 13214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33958 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33954 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2172:
-#line 13215 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13211 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33964 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33960 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2173:
-#line 13216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13212 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33970 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33966 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2174:
-#line 13217 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13213 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33976 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33972 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2175:
-#line 13218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33982 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33978 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2176:
-#line 13219 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13215 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33988 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33984 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2177:
-#line 13220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13216 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 33994 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33990 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2178:
-#line 13221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13217 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34000 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 33996 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2179:
-#line 13222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13218 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2180:
-#line 13223 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13219 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2181:
-#line 13224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13220 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34014 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2182:
-#line 13225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34020 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2183:
-#line 13226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13222 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2184:
-#line 13227 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13223 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34036 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34032 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2185:
-#line 13228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2186:
-#line 13229 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13225 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34044 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2187:
-#line 13230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13226 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34050 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2188:
-#line 13231 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13227 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34060 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34056 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2189:
-#line 13232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34066 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2190:
-#line 13233 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13229 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34072 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34068 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2191:
-#line 13234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13230 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2192:
-#line 13235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13231 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34080 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2193:
-#line 13236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13232 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34086 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2194:
-#line 13237 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13233 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34096 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34092 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2195:
-#line 13238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34102 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34098 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2196:
-#line 13239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34108 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34104 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2197:
-#line 13240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13236 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34114 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34110 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2198:
-#line 13241 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13237 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34120 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34116 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2199:
-#line 13242 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34126 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34122 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2200:
-#line 13243 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34132 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34128 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2201:
-#line 13244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34138 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34134 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2202:
-#line 13245 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13241 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34144 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34140 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2203:
-#line 13246 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13242 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34150 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34146 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2204:
-#line 13247 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13243 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34152 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2205:
-#line 13248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34162 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34158 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2206:
-#line 13249 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13245 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34168 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34164 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2207:
-#line 13250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13246 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34174 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34170 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2208:
-#line 13251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13247 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34180 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34176 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2209:
-#line 13252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34182 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2210:
-#line 13253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13249 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34192 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34188 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2211:
-#line 13254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2212:
-#line 13255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13251 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34204 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34200 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2213:
-#line 13256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34210 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34206 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2214:
-#line 13257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2215:
-#line 13258 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34222 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34218 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2216:
-#line 13259 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13255 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34228 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34224 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2217:
-#line 13260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2218:
-#line 13261 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34236 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2219:
-#line 13262 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13258 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34242 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2220:
-#line 13263 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13259 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34252 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34248 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2221:
-#line 13264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13260 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34258 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34254 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2222:
-#line 13265 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13261 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34264 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34260 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2223:
-#line 13266 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13262 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34266 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2224:
-#line 13267 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13263 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34276 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34272 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2225:
-#line 13268 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34282 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34278 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2226:
-#line 13269 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13265 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34288 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34284 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2227:
-#line 13270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13266 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34294 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34290 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2228:
-#line 13271 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13267 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34300 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34296 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2229:
-#line 13272 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13268 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34302 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2230:
-#line 13273 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13269 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34312 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34308 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2231:
-#line 13274 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2232:
-#line 13275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13271 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34324 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34320 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2233:
-#line 13276 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13272 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34326 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2234:
-#line 13277 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13273 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34336 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34332 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2235:
-#line 13278 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13274 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34338 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2236:
-#line 13279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13275 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34348 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34344 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2237:
-#line 13280 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13276 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34354 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34350 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2238:
-#line 13281 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13277 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34360 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34356 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2239:
-#line 13282 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13278 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34366 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34362 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2240:
-#line 13283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13279 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34372 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34368 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2241:
-#line 13284 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13280 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34378 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34374 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2242:
-#line 13285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13281 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34384 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34380 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2243:
-#line 13286 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13282 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34390 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34386 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2244:
-#line 13287 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13283 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34396 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34392 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2245:
-#line 13288 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13284 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34402 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34398 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2246:
-#line 13289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13285 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34408 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34404 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2247:
-#line 13290 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13286 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34414 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34410 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2248:
-#line 13291 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13287 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34420 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34416 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2249:
-#line 13292 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13288 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34426 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34422 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2250:
-#line 13293 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13289 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34432 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34428 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2251:
-#line 13294 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13290 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34438 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34434 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2252:
-#line 13295 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13291 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34444 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34440 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2253:
-#line 13296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13292 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34450 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34446 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2254:
-#line 13297 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13293 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34456 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34452 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2255:
-#line 13298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13294 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34458 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2256:
-#line 13299 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13295 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34468 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34464 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2257:
-#line 13300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34474 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34470 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2258:
-#line 13301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13297 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34480 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2259:
-#line 13302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13298 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2260:
-#line 13303 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13299 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34488 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2261:
-#line 13304 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34498 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34494 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2262:
-#line 13305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2263:
-#line 13306 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2264:
-#line 13307 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13303 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2265:
-#line 13308 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13304 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34518 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2266:
-#line 13309 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13305 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34528 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34524 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2267:
-#line 13310 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13306 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34534 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34530 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2268:
-#line 13311 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13307 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34536 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2269:
-#line 13312 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13308 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2270:
-#line 13313 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13309 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34548 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2271:
-#line 13314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13310 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34554 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2272:
-#line 13315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13311 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34564 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34560 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2273:
-#line 13316 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13312 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34570 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34566 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2274:
-#line 13317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13313 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34576 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34572 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2275:
-#line 13318 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13314 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34582 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34578 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2276:
-#line 13319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13315 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34588 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34584 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2277:
-#line 13320 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13316 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34594 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34590 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2278:
-#line 13321 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34600 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34596 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2279:
-#line 13322 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13318 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34606 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34602 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2280:
-#line 13323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13319 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34612 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34608 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2281:
-#line 13324 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13320 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34618 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2282:
-#line 13325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13321 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34624 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34620 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2283:
-#line 13326 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13322 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34630 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2284:
-#line 13327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13323 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34636 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2285:
-#line 13328 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13324 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34642 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34638 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2286:
-#line 13329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13325 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34648 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2287:
-#line 13330 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13326 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34654 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34650 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2288:
-#line 13331 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34660 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34656 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2289:
-#line 13332 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13328 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34666 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34662 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2290:
-#line 13333 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13329 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34668 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2291:
-#line 13334 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13330 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34674 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2292:
-#line 13335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13331 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34684 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34680 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2293:
-#line 13336 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13332 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34686 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2294:
-#line 13337 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13333 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34696 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34692 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2295:
-#line 13338 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13334 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34698 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2296:
-#line 13339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13335 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34708 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34704 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2297:
-#line 13340 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13336 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34714 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34710 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2298:
-#line 13341 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13337 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2299:
-#line 13342 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13338 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34726 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34722 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2300:
-#line 13343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13339 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34728 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2301:
-#line 13344 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13340 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34738 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34734 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2302:
-#line 13345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13341 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34744 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34740 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2303:
-#line 13346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13342 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34750 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34746 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2304:
-#line 13347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13343 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34756 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34752 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2305:
-#line 13348 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13344 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34762 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34758 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2306:
-#line 13349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13345 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34768 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34764 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2307:
-#line 13350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13346 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34774 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34770 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2308:
-#line 13351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13347 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34780 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34776 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2309:
-#line 13352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13348 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34786 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2310:
-#line 13353 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13349 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2311:
-#line 13354 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13350 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34798 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34794 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2312:
-#line 13355 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13351 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34804 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2313:
-#line 13356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13352 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34810 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2314:
-#line 13357 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13353 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34816 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34812 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2315:
-#line 13358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13354 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34822 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2316:
-#line 13359 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13355 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34824 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2317:
-#line 13360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34830 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2318:
-#line 13361 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13357 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34840 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34836 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2319:
-#line 13362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13358 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34846 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34842 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2320:
-#line 13363 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13359 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34848 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2321:
-#line 13364 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34854 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2322:
-#line 13365 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13361 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34860 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2323:
-#line 13366 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13362 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34870 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34866 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2324:
-#line 13367 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13363 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34876 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34872 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2325:
-#line 13368 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13364 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34882 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34878 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2326:
-#line 13369 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13365 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34888 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34884 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2327:
-#line 13376 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13372 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SET_OPTION;
@@ -34898,29 +34894,29 @@ yyreduce:
lex->one_shot_set= 0;
lex->autocommit= 0;
}
-#line 34902 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34898 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2328:
-#line 13386 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13382 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34908 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34904 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2329:
-#line 13390 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13386 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34914 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34910 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2330:
-#line 13391 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13387 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 34920 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2333:
-#line 13400 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13396 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -34950,11 +34946,11 @@ yyreduce:
lex->sphead->m_tmp_query= lip->get_tok_start();
}
}
-#line 34954 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 34950 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2334:
-#line 13430 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13426 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -35002,95 +34998,95 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 35006 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35002 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2335:
-#line 13480 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13476 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35012 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35008 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2336:
-#line 13481 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13477 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_GLOBAL; }
-#line 35018 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35014 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2337:
-#line 13482 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13478 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35024 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35020 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2338:
-#line 13483 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13479 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35030 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35026 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2339:
-#line 13487 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13483 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= OPT_DEFAULT; }
-#line 35036 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35032 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2340:
-#line 13488 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13484 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->one_shot_set= 1; (yyval.num)= OPT_SESSION; }
-#line 35042 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35038 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2341:
-#line 13492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13488 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35048 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35044 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2342:
-#line 13493 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13489 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_GLOBAL; }
-#line 35054 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35050 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2343:
-#line 13494 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13490 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35060 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35056 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2344:
-#line 13495 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13491 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35066 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35062 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2345:
-#line 13499 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13495 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_DEFAULT; }
-#line 35072 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35068 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2346:
-#line 13500 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_GLOBAL; }
-#line 35078 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35074 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2347:
-#line 13501 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13497 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35080 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2348:
-#line 13502 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13498 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.var_type)=OPT_SESSION; }
-#line 35090 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35086 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2351:
-#line 13512 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13508 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
LEX_STRING *name= &(yyvsp[-2].variable).base_name;
@@ -35131,11 +35127,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 35135 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35131 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2352:
-#line 13553 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13549 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->option_type= (yyvsp[-4].var_type);
@@ -35150,11 +35146,11 @@ yyreduce:
MYSQL_YYABORT;
lex->var_list.push_back(var);
}
-#line 35154 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35150 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2353:
-#line 13571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13567 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Item_func_set_user_var *item;
item= new (thd->mem_root) Item_func_set_user_var((yyvsp[-2].lex_str), (yyvsp[0].item));
@@ -35165,11 +35161,11 @@ yyreduce:
MYSQL_YYABORT;
Lex->var_list.push_back(var);
}
-#line 35169 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35165 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2354:
-#line 13582 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13578 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
struct sys_var_with_base tmp= (yyvsp[-2].variable);
/* Lookup if necessary: must be a system variable. */
@@ -35181,11 +35177,11 @@ yyreduce:
if (set_system_variable(thd, &tmp, (yyvsp[-3].var_type), (yyvsp[0].item)))
MYSQL_YYABORT;
}
-#line 35185 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35181 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2355:
-#line 13594 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13590 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
CHARSET_INFO *cs2;
@@ -35198,11 +35194,11 @@ yyreduce:
MYSQL_YYABORT;
lex->var_list.push_back(var);
}
-#line 35202 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2356:
-#line 13607 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13603 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
sp_pcontext *spc= lex->spcont;
@@ -35217,11 +35213,11 @@ yyreduce:
MYSQL_YYABORT;
}
-#line 35221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35217 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2357:
-#line 13622 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13618 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
CHARSET_INFO *cs2;
@@ -35240,11 +35236,11 @@ yyreduce:
MYSQL_YYABORT;
lex->var_list.push_back(var);
}
-#line 35244 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35240 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2358:
-#line 13641 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13637 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
LEX_USER *user;
@@ -35270,11 +35266,11 @@ yyreduce:
if (lex->sphead)
lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
}
-#line 35274 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2359:
-#line 13667 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13663 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
set_var_password *var= new set_var_password((yyvsp[-2].lex_user),(yyvsp[0].simple_string));
if (var == NULL)
@@ -35284,11 +35280,11 @@ yyreduce:
if (Lex->sphead)
Lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
}
-#line 35288 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35284 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2360:
-#line 13680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13676 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
sp_pcontext *spc= thd->lex->spcont;
sp_variable_t *spv;
@@ -35314,11 +35310,11 @@ yyreduce:
(yyval.variable).base_name= (yyvsp[0].lex_str);
}
}
-#line 35318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2361:
-#line 13706 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13702 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (check_reserved_words(&(yyvsp[-2].lex_str)))
@@ -35361,11 +35357,11 @@ yyreduce:
(yyval.variable).base_name= (yyvsp[-2].lex_str);
}
}
-#line 35365 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35361 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2362:
-#line 13749 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13745 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
sys_var *tmp=find_sys_var(thd, (yyvsp[0].lex_str).str, (yyvsp[0].lex_str).length);
if (!tmp)
@@ -35376,41 +35372,41 @@ yyreduce:
(yyval.variable).base_name.str= (char*) "default";
(yyval.variable).base_name.length= 7;
}
-#line 35380 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35376 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2363:
-#line 13762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13758 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
-#line 35386 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35382 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2364:
-#line 13763 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13759 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.tx_isolation)= ISO_READ_COMMITTED; }
-#line 35392 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35388 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2365:
-#line 13764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
-#line 35398 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35394 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2366:
-#line 13765 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13761 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.tx_isolation)= ISO_SERIALIZABLE; }
-#line 35404 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35400 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2367:
-#line 13769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13765 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.simple_string)=(yyvsp[0].lex_str).str;}
-#line 35410 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35406 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2368:
-#line 13771 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13767 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.simple_string)= (yyvsp[-1].lex_str).length ? thd->variables.old_passwords ?
Item_func_old_password::alloc(thd, (yyvsp[-1].lex_str).str, (yyvsp[-1].lex_str).length) :
@@ -35419,11 +35415,11 @@ yyreduce:
if ((yyval.simple_string) == NULL)
MYSQL_YYABORT;
}
-#line 35423 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35419 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2369:
-#line 13780 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13776 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.simple_string)= (yyvsp[-1].lex_str).length ? Item_func_old_password::alloc(thd, (yyvsp[-1].lex_str).str,
(yyvsp[-1].lex_str).length) :
@@ -35431,53 +35427,53 @@ yyreduce:
if ((yyval.simple_string) == NULL)
MYSQL_YYABORT;
}
-#line 35435 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2370:
-#line 13791 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13787 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=(yyvsp[0].item); }
-#line 35441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35437 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2371:
-#line 13792 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13788 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.item)=0; }
-#line 35447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35443 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2372:
-#line 13794 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13790 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)=new (thd->mem_root) Item_string("ON", 2, system_charset_info);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 35457 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35453 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2373:
-#line 13800 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13796 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)=new (thd->mem_root) Item_string("ALL", 3, system_charset_info);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 35467 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35463 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2374:
-#line 13806 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13802 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.item)=new (thd->mem_root) Item_string("binary", 6, system_charset_info);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
-#line 35477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35473 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2375:
-#line 13817 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13813 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -35488,29 +35484,29 @@ yyreduce:
}
lex->sql_command= SQLCOM_LOCK_TABLES;
}
-#line 35492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35488 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2376:
-#line 13828 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13824 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35498 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35494 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2377:
-#line 13832 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13828 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 35504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2378:
-#line 13833 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13829 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ }
-#line 35510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2381:
-#line 13843 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13839 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
thr_lock_type lock_type= (thr_lock_type) (yyvsp[0].num);
bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -35522,43 +35518,43 @@ yyreduce:
MDL_SHARED_READ)))
MYSQL_YYABORT;
}
-#line 35526 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2382:
-#line 13857 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13853 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= TL_READ_NO_INSERT; }
-#line 35532 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35528 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2383:
-#line 13858 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13854 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= TL_WRITE_DEFAULT; }
-#line 35538 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35534 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2384:
-#line 13860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13856 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.num)= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT);
}
-#line 35546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35542 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2385:
-#line 13864 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= TL_WRITE_LOW_PRIORITY; }
-#line 35552 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35548 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2386:
-#line 13865 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13861 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= TL_READ; }
-#line 35558 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35554 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2387:
-#line 13870 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
@@ -35569,17 +35565,17 @@ yyreduce:
}
lex->sql_command= SQLCOM_UNLOCK_TABLES;
}
-#line 35573 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35569 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2388:
-#line 13881 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13877 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35575 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2389:
-#line 13890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13886 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->sphead)
@@ -35591,11 +35587,11 @@ yyreduce:
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[-2].table), (yyvsp[0].lex_str_ptr), 0))
MYSQL_YYABORT;
}
-#line 35595 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35591 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2390:
-#line 13902 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13898 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->sphead)
@@ -35607,11 +35603,11 @@ yyreduce:
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[-1].table), 0, 0))
MYSQL_YYABORT;
}
-#line 35611 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35607 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2391:
-#line 13914 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13910 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->sphead)
@@ -35631,11 +35627,11 @@ yyreduce:
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[-1].table), 0, 0))
MYSQL_YYABORT;
}
-#line 35635 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35631 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2392:
-#line 13934 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13930 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->expr_allows_subselect= TRUE;
/* Stored functions are not supported for HANDLER READ. */
@@ -35646,59 +35642,59 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 35650 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35646 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2393:
-#line 13947 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13943 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ident= null_lex_str; }
-#line 35656 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35652 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2394:
-#line 13948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13944 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ident= (yyvsp[-1].lex_str); }
-#line 35662 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35658 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2395:
-#line 13952 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13948 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RFIRST; }
-#line 35668 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35664 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2396:
-#line 13953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13949 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RNEXT; }
-#line 35674 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35670 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2397:
-#line 13957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RFIRST; }
-#line 35680 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35676 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2398:
-#line 13958 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13954 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RNEXT; }
-#line 35686 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35682 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2399:
-#line 13959 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13955 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RPREV; }
-#line 35692 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35688 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2400:
-#line 13960 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13956 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->ha_read_mode = RLAST; }
-#line 35698 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2401:
-#line 13962 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13958 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->ha_read_mode = RKEY;
@@ -35706,63 +35702,63 @@ yyreduce:
if (!(lex->insert_list = new List_item))
MYSQL_YYABORT;
}
-#line 35710 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2402:
-#line 13970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13966 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35716 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35712 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2403:
-#line 13974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT; }
-#line 35722 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35718 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2404:
-#line 13975 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13971 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
-#line 35728 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35724 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2405:
-#line 13976 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13972 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
-#line 35734 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35730 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2406:
-#line 13977 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13973 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY; }
-#line 35740 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35736 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2407:
-#line 13978 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY; }
-#line 35746 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35742 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2408:
-#line 13985 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13981 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35752 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35748 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2409:
-#line 13990 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13986 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_REVOKE;
lex->type= 0;
}
-#line 35762 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35758 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2410:
-#line 13996 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 13992 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -35773,11 +35769,11 @@ yyreduce:
lex->sql_command= SQLCOM_REVOKE;
lex->type= TYPE_ENUM_FUNCTION;
}
-#line 35777 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35773 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2411:
-#line 14007 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14003 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -35788,46 +35784,46 @@ yyreduce:
lex->sql_command= SQLCOM_REVOKE;
lex->type= TYPE_ENUM_PROCEDURE;
}
-#line 35792 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2412:
-#line 14018 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14014 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_REVOKE_ALL;
}
-#line 35800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2413:
-#line 14022 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14018 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->users_list.push_front ((yyvsp[-2].lex_user));
lex->sql_command= SQLCOM_REVOKE;
lex->type= TYPE_ENUM_PROXY;
}
-#line 35811 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35807 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2414:
-#line 14032 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14028 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35817 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35813 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2415:
-#line 14038 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14034 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_GRANT;
lex->type= 0;
}
-#line 35827 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35823 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2416:
-#line 14045 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14041 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -35838,11 +35834,11 @@ yyreduce:
lex->sql_command= SQLCOM_GRANT;
lex->type= TYPE_ENUM_FUNCTION;
}
-#line 35842 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2417:
-#line 14057 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14053 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -35853,253 +35849,253 @@ yyreduce:
lex->sql_command= SQLCOM_GRANT;
lex->type= TYPE_ENUM_PROCEDURE;
}
-#line 35857 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35853 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2418:
-#line 14068 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14064 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->users_list.push_front ((yyvsp[-3].lex_user));
lex->sql_command= SQLCOM_GRANT;
lex->type= TYPE_ENUM_PROXY;
}
-#line 35868 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35864 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2421:
-#line 14082 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14078 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35874 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35870 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2422:
-#line 14084 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14080 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->all_privileges= 1;
Lex->grant= GLOBAL_ACLS;
}
-#line 35883 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35879 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2427:
-#line 14102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14098 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->which_columns = SELECT_ACL;}
-#line 35889 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35885 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2428:
-#line 14103 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14099 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35895 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35891 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2429:
-#line 14105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14101 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->which_columns = INSERT_ACL;}
-#line 35901 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2430:
-#line 14106 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14102 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35907 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35903 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2431:
-#line 14108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14104 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->which_columns = UPDATE_ACL; }
-#line 35913 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35909 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2432:
-#line 14109 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14105 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35919 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35915 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2433:
-#line 14111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14107 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->which_columns = REFERENCES_ACL;}
-#line 35925 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35921 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2434:
-#line 14112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14108 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35931 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2435:
-#line 14113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14109 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= DELETE_ACL;}
-#line 35937 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2436:
-#line 14114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14110 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 35943 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2437:
-#line 14115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14111 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= INDEX_ACL;}
-#line 35949 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35945 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2438:
-#line 14116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14112 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= ALTER_ACL;}
-#line 35955 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35951 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2439:
-#line 14117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14113 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_ACL;}
-#line 35961 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35957 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2440:
-#line 14118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14114 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= DROP_ACL;}
-#line 35967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35963 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2441:
-#line 14119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14115 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= EXECUTE_ACL;}
-#line 35973 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35969 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2442:
-#line 14120 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14116 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= RELOAD_ACL;}
-#line 35979 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35975 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2443:
-#line 14121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14117 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= SHUTDOWN_ACL;}
-#line 35985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35981 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2444:
-#line 14122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14118 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= PROCESS_ACL;}
-#line 35991 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35987 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2445:
-#line 14123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14119 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= FILE_ACL;}
-#line 35997 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35993 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2446:
-#line 14124 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14120 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= GRANT_ACL;}
-#line 36003 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 35999 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2447:
-#line 14125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14121 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= SHOW_DB_ACL;}
-#line 36009 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36005 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2448:
-#line 14126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= SUPER_ACL;}
-#line 36015 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36011 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2449:
-#line 14127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14123 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_TMP_ACL;}
-#line 36021 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2450:
-#line 14128 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14124 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= LOCK_TABLES_ACL; }
-#line 36027 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36023 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2451:
-#line 14129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14125 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= REPL_SLAVE_ACL; }
-#line 36033 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36029 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2452:
-#line 14130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= REPL_CLIENT_ACL; }
-#line 36039 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36035 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2453:
-#line 14131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14127 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_VIEW_ACL; }
-#line 36045 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36041 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2454:
-#line 14132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14128 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= SHOW_VIEW_ACL; }
-#line 36051 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36047 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2455:
-#line 14133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14129 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_PROC_ACL; }
-#line 36057 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36053 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2456:
-#line 14134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14130 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= ALTER_PROC_ACL; }
-#line 36063 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36059 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2457:
-#line 14135 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14131 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_USER_ACL; }
-#line 36069 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36065 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2458:
-#line 14136 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14132 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= EVENT_ACL;}
-#line 36075 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36071 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2459:
-#line 14137 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14133 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= TRIGGER_ACL; }
-#line 36081 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36077 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2460:
-#line 14138 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14134 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= CREATE_TABLESPACE_ACL; }
-#line 36087 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36083 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2461:
-#line 14142 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14138 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36093 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36089 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2462:
-#line 14143 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14139 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36099 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36095 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2465:
-#line 14153 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14149 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->x509_subject)
@@ -36109,11 +36105,11 @@ yyreduce:
}
lex->x509_subject=(yyvsp[0].lex_str).str;
}
-#line 36113 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36109 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2466:
-#line 14163 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14159 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->x509_issuer)
@@ -36123,11 +36119,11 @@ yyreduce:
}
lex->x509_issuer=(yyvsp[0].lex_str).str;
}
-#line 36127 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36123 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2467:
-#line 14173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (lex->ssl_cipher)
@@ -36137,11 +36133,11 @@ yyreduce:
}
lex->ssl_cipher=(yyvsp[0].lex_str).str;
}
-#line 36141 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36137 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2468:
-#line 14186 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14182 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
size_t dummy;
@@ -36156,11 +36152,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 36160 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2469:
-#line 14201 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14197 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->current_select->db = (yyvsp[-2].lex_str).str;
@@ -36173,11 +36169,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 36177 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36173 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2470:
-#line 14214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->current_select->db = NULL;
@@ -36190,11 +36186,11 @@ yyreduce:
MYSQL_YYABORT;
}
}
-#line 36194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2471:
-#line 14227 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14223 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[0].table),NULL,
@@ -36203,47 +36199,47 @@ yyreduce:
if (lex->grant == GLOBAL_ACLS)
lex->grant = TABLE_ACLS & ~GRANT_ACL;
}
-#line 36207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36203 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2472:
-#line 14239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14235 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 36216 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36212 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2473:
-#line 14244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 36225 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36221 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2474:
-#line 14252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 36234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36230 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2475:
-#line 14257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14253 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (Lex->users_list.push_back((yyvsp[0].lex_user)))
MYSQL_YYABORT;
}
-#line 36243 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36239 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2480:
-#line 14268 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14264 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_user)=(yyvsp[-3].lex_user); (yyvsp[-3].lex_user)->password=(yyvsp[0].lex_str);
if ((yyvsp[0].lex_str).length)
@@ -36270,55 +36266,55 @@ yyreduce:
}
}
}
-#line 36274 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36270 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2481:
-#line 14295 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14291 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_user)= (yyvsp[-4].lex_user);
(yyvsp[-4].lex_user)->password= (yyvsp[0].lex_str);
}
-#line 36283 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36279 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2482:
-#line 14300 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14296 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_user)= (yyvsp[-3].lex_user);
(yyvsp[-3].lex_user)->plugin= (yyvsp[0].lex_str);
(yyvsp[-3].lex_user)->auth= empty_lex_str;
}
-#line 36293 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36289 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2483:
-#line 14306 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14302 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.lex_user)= (yyvsp[-5].lex_user);
(yyvsp[-5].lex_user)->plugin= (yyvsp[-2].lex_str);
(yyvsp[-5].lex_user)->auth= (yyvsp[0].lex_str);
}
-#line 36303 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36299 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2484:
-#line 14312 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14308 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.lex_user)= (yyvsp[0].lex_user); (yyvsp[0].lex_user)->password= null_lex_str; }
-#line 36309 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36305 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2485:
-#line 14317 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14313 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->grant |= lex->which_columns;
}
-#line 36318 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36314 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2489:
-#line 14331 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14327 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
String *new_str = new (thd->mem_root) String((const char*) (yyvsp[0].lex_str).str,(yyvsp[0].lex_str).length,system_charset_info);
if (new_str == NULL)
@@ -36343,195 +36339,195 @@ yyreduce:
lex->columns.push_back(col);
}
}
-#line 36347 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36343 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2491:
-#line 14360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14356 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->ssl_type=SSL_TYPE_SPECIFIED;
}
-#line 36355 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36351 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2492:
-#line 14364 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14360 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->ssl_type=SSL_TYPE_ANY;
}
-#line 36363 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36359 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2493:
-#line 14368 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14364 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->ssl_type=SSL_TYPE_X509;
}
-#line 36371 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36367 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2494:
-#line 14372 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14368 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->ssl_type=SSL_TYPE_NONE;
}
-#line 36379 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36375 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2495:
-#line 14378 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14374 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36385 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2497:
-#line 14383 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14379 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36391 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36387 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2498:
-#line 14384 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14380 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= GRANT_ACL;}
-#line 36397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2499:
-#line 14388 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14384 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36403 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36399 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2500:
-#line 14389 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14385 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36409 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36405 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2501:
-#line 14393 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14389 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->grant |= GRANT_ACL;}
-#line 36415 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36411 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2502:
-#line 14395 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14391 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->mqh.questions=(yyvsp[0].ulong_num);
lex->mqh.specified_limits|= USER_RESOURCES::QUERIES_PER_HOUR;
}
-#line 36425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2503:
-#line 14401 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14397 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->mqh.updates=(yyvsp[0].ulong_num);
lex->mqh.specified_limits|= USER_RESOURCES::UPDATES_PER_HOUR;
}
-#line 36435 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36431 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2504:
-#line 14407 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14403 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->mqh.conn_per_hour= (yyvsp[0].ulong_num);
lex->mqh.specified_limits|= USER_RESOURCES::CONNECTIONS_PER_HOUR;
}
-#line 36445 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36441 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2505:
-#line 14413 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14409 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->mqh.user_conn= (yyvsp[0].num);
lex->mqh.specified_limits|= USER_RESOURCES::USER_CONNECTIONS;
}
-#line 36455 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36451 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2506:
-#line 14422 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14418 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_BEGIN;
lex->start_transaction_opt= 0;
}
-#line 36465 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36461 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2507:
-#line 14427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14423 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36471 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36467 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2508:
-#line 14431 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14427 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36477 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36473 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2509:
-#line 14432 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14428 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36483 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36479 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2510:
-#line 14437 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14433 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
-#line 36489 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36485 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2511:
-#line 14438 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14434 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_NO; }
-#line 36495 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36491 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2512:
-#line 14439 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14435 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_YES; }
-#line 36501 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36497 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2513:
-#line 14444 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14440 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
-#line 36507 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36503 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2514:
-#line 14445 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14441 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_YES; }
-#line 36513 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36509 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2515:
-#line 14446 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14442 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.m_yes_no_unk)= TVL_NO; }
-#line 36519 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36515 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2516:
-#line 14450 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14446 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36525 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36521 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2517:
-#line 14451 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14447 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36531 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36527 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2518:
-#line 14456 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14452 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_COMMIT;
@@ -36540,11 +36536,11 @@ yyreduce:
lex->tx_chain= (yyvsp[-1].m_yes_no_unk);
lex->tx_release= (yyvsp[0].m_yes_no_unk);
}
-#line 36544 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36540 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2519:
-#line 14468 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14464 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK;
@@ -36553,56 +36549,56 @@ yyreduce:
lex->tx_chain= (yyvsp[-1].m_yes_no_unk);
lex->tx_release= (yyvsp[0].m_yes_no_unk);
}
-#line 36557 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36553 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2520:
-#line 14478 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14474 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
lex->ident= (yyvsp[0].lex_str);
}
-#line 36567 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36563 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2521:
-#line 14487 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14483 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SAVEPOINT;
lex->ident= (yyvsp[0].lex_str);
}
-#line 36577 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36573 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2522:
-#line 14496 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14492 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
lex->ident= (yyvsp[0].lex_str);
}
-#line 36587 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36583 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2523:
-#line 14509 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14505 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36593 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36589 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2525:
-#line 14515 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14511 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_select_to_union_list(Lex, (bool)(yyvsp[0].num), TRUE))
MYSQL_YYABORT;
}
-#line 36602 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36598 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2526:
-#line 14520 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14516 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
Remove from the name resolution context stack the context of the
@@ -36610,41 +36606,41 @@ yyreduce:
*/
Lex->pop_context();
}
-#line 36614 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36610 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2527:
-#line 14530 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14526 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 0; }
-#line 36620 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36616 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2528:
-#line 14531 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14527 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 36626 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36622 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2529:
-#line 14532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14528 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)= 1; }
-#line 36632 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36628 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2530:
-#line 14536 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14532 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.is_not_empty)= false; }
-#line 36638 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36634 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2531:
-#line 14537 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14533 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.is_not_empty)= true; }
-#line 36644 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36640 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2532:
-#line 14541 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14537 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
@@ -36659,80 +36655,80 @@ yyreduce:
}
thd->where= "global ORDER clause";
}
-#line 36663 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36659 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2533:
-#line 14556 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14552 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
thd->lex->current_select->no_table_names_allowed= 0;
thd->where= "";
}
-#line 36672 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36668 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2536:
-#line 14568 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14564 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=1; }
-#line 36678 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36674 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2537:
-#line 14569 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14565 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=1; }
-#line 36684 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36680 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2538:
-#line 14570 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14566 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ (yyval.num)=0; }
-#line 36690 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36686 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2539:
-#line 14575 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14571 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.select_lex)= Lex->current_select->master_unit()->first_select();
}
-#line 36698 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36694 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2540:
-#line 14579 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14575 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.select_lex)= Lex->current_select->master_unit()->first_select();
}
-#line 36706 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36702 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2542:
-#line 14588 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14584 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (add_select_to_union_list(Lex, (bool)(yyvsp[0].num), FALSE))
MYSQL_YYABORT;
}
-#line 36715 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36711 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2543:
-#line 14594 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14590 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->pop_context();
(yyval.select_lex)= (yyvsp[-5].select_lex);
}
-#line 36724 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36720 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2544:
-#line 14603 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14599 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
(yyval.select_lex)= (yyvsp[-1].select_lex);
}
-#line 36732 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36728 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2545:
-#line 14609 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14605 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
if (!lex->expr_allows_subselect ||
@@ -36751,11 +36747,11 @@ yyreduce:
if (mysql_new_select(Lex, 1))
MYSQL_YYABORT;
}
-#line 36755 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36751 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2546:
-#line 14630 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14626 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex=Lex;
@@ -36778,17 +36774,17 @@ yyreduce:
lex->current_select->select_n_having_items+=
child->select_n_having_items;
}
-#line 36782 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36778 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2551:
-#line 14665 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14661 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= SELECT_STRAIGHT_JOIN; }
-#line 36788 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36784 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2552:
-#line 14667 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14663 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -36796,73 +36792,73 @@ yyreduce:
YYPS->m_mdl_type= MDL_SHARED_READ;
Select->options|= SELECT_HIGH_PRIORITY;
}
-#line 36800 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36796 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2553:
-#line 14674 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14670 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= SELECT_DISTINCT; }
-#line 36806 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36802 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2554:
-#line 14675 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14671 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= SELECT_SMALL_RESULT; }
-#line 36812 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36808 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2555:
-#line 14676 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14672 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= SELECT_BIG_RESULT; }
-#line 36818 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36814 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2556:
-#line 14678 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14674 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (check_simple_select())
MYSQL_YYABORT;
Select->options|= OPTION_BUFFER_RESULT;
}
-#line 36828 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36824 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2557:
-#line 14684 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14680 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
if (check_simple_select())
MYSQL_YYABORT;
Select->options|= OPTION_FOUND_ROWS;
}
-#line 36838 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36834 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2558:
-#line 14689 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14685 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Select->options|= SELECT_ALL; }
-#line 36844 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36840 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2559:
-#line 14700 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14696 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36850 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36846 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2560:
-#line 14702 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14698 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36856 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36852 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2561:
-#line 14704 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14700 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36862 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36858 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2575:
-#line 14737 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14733 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
/*
We have to distinguish missing DEFINER-clause from case when
@@ -36873,79 +36869,79 @@ yyreduce:
*/
thd->lex->definer= 0;
}
-#line 36877 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36873 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2576:
-#line 14751 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14747 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
thd->lex->definer= get_current_user(thd, (yyvsp[0].lex_user));
}
-#line 36885 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36881 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2577:
-#line 14764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14760 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36891 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36887 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2578:
-#line 14766 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14762 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36897 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36893 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2579:
-#line 14768 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14764 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36903 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36899 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2580:
-#line 14773 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14769 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
-#line 36909 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36905 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2581:
-#line 14778 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14774 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_algorithm= DTYPE_ALGORITHM_UNDEFINED; }
-#line 36915 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36911 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2582:
-#line 14780 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14776 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
-#line 36921 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36917 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2583:
-#line 14782 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14778 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
-#line 36927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36923 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2584:
-#line 14787 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14783 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_suid= VIEW_SUID_DEFAULT; }
-#line 36933 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36929 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2585:
-#line 14789 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14785 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_suid= VIEW_SUID_DEFINER; }
-#line 36939 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36935 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2586:
-#line 14791 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14787 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_suid= VIEW_SUID_INVOKER; }
-#line 36945 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36941 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2587:
-#line 14796 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14792 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->sql_command= SQLCOM_CREATE_VIEW;
@@ -36957,35 +36953,35 @@ yyreduce:
MYSQL_YYABORT;
lex->query_tables->open_strategy= TABLE_LIST::OPEN_STUB;
}
-#line 36961 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36957 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2589:
-#line 14812 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14808 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 36967 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36963 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2591:
-#line 14818 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14814 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[0].lex_str), sizeof(LEX_STRING)));
}
-#line 36976 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36972 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2592:
-#line 14823 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14819 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[0].lex_str), sizeof(LEX_STRING)));
}
-#line 36985 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36981 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2593:
-#line 14830 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14826 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->parsing_options.allows_variable= FALSE;
@@ -36994,11 +36990,11 @@ yyreduce:
lex->parsing_options.allows_derived= FALSE;
lex->create_view_select.str= (char *) YYLIP->get_cpp_ptr();
}
-#line 36998 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 36994 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2594:
-#line 14839 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14835 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
@@ -37011,51 +37007,51 @@ yyreduce:
lex->parsing_options.allows_select_procedure= TRUE;
lex->parsing_options.allows_derived= TRUE;
}
-#line 37015 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37011 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2597:
-#line 14860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14856 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_check= VIEW_CHECK_NONE; }
-#line 37021 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37017 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2598:
-#line 14862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14858 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
-#line 37027 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37023 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2599:
-#line 14864 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14860 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
-#line 37033 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37029 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2600:
-#line 14866 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14862 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->create_view_check= VIEW_CHECK_LOCAL; }
-#line 37039 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37035 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2601:
-#line 14883 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14879 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $8 */
Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start();
}
-#line 37047 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37043 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2602:
-#line 14889 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14885 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $12 */
Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start();
}
-#line 37055 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37051 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2603:
-#line 14894 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14890 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $15 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -37084,11 +37080,11 @@ yyreduce:
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->set_body_start(thd, lip->get_cpp_ptr());
}
-#line 37088 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37084 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2604:
-#line 14923 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14919 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $17 */
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -37112,11 +37108,11 @@ yyreduce:
MDL_SHARED_NO_WRITE))
MYSQL_YYABORT;
}
-#line 37116 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37112 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2605:
-#line 14957 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14953 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
if (is_native_function(thd, & (yyvsp[-4].lex_str)))
@@ -37132,11 +37128,11 @@ yyreduce:
lex->udf.returns=(Item_result) (yyvsp[-2].num);
lex->udf.dl=(yyvsp[0].lex_str).str;
}
-#line 37136 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37132 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2606:
-#line 14974 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14970 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
if (is_native_function(thd, & (yyvsp[-4].lex_str)))
@@ -37152,11 +37148,11 @@ yyreduce:
lex->udf.returns=(Item_result) (yyvsp[-2].num);
lex->udf.dl=(yyvsp[0].lex_str).str;
}
-#line 37156 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37152 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2607:
-#line 14996 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 14992 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $5 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -37186,19 +37182,19 @@ yyreduce:
tmp_param_begin++;
lex->sphead->m_param_begin= tmp_param_begin;
}
-#line 37190 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37186 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2608:
-#line 15027 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15023 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $8 */
Lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
}
-#line 37198 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37194 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2609:
-#line 15031 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15027 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $10 */
LEX *lex= Lex;
lex->charset= NULL;
@@ -37207,11 +37203,11 @@ yyreduce:
lex->type= 0;
lex->vcol_info= 0;
}
-#line 37211 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37207 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2610:
-#line 15040 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15036 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $12 */
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -37234,11 +37230,11 @@ yyreduce:
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
}
-#line 37238 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37234 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2611:
-#line 15063 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15059 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ /* $14 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -37246,11 +37242,11 @@ yyreduce:
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->set_body_start(thd, lip->get_cpp_tok_start());
}
-#line 37250 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37246 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2612:
-#line 15071 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15067 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
sp_head *sp= lex->sphead;
@@ -37302,11 +37298,11 @@ yyreduce:
}
sp->restore_thd_mem_root(thd);
}
-#line 37306 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37302 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2613:
-#line 15126 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15122 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
sp_head *sp;
@@ -37330,11 +37326,11 @@ yyreduce:
lex->sphead= sp;
}
-#line 37334 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37330 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2614:
-#line 15150 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15146 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
const char* tmp_param_begin;
@@ -37342,33 +37338,33 @@ yyreduce:
tmp_param_begin++;
Lex->sphead->m_param_begin= tmp_param_begin;
}
-#line 37346 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37342 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2615:
-#line 15159 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15155 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
}
-#line 37357 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37353 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2616:
-#line 15166 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15162 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= thd->lex;
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->set_body_start(thd, YYLIP->get_cpp_tok_start());
}
-#line 37368 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37364 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2617:
-#line 15173 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15169 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -37377,209 +37373,209 @@ yyreduce:
lex->sql_command= SQLCOM_CREATE_PROCEDURE;
sp->restore_thd_mem_root(thd);
}
-#line 37381 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37377 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2618:
-#line 15187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15183 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_START;
}
-#line 37389 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37385 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2619:
-#line 15191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15187 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_END;
}
-#line 37397 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37393 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2620:
-#line 15195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15191 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_PREPARE;
}
-#line 37405 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37401 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2621:
-#line 15199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15195 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_COMMIT;
}
-#line 37413 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37409 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2622:
-#line 15203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15199 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_ROLLBACK;
}
-#line 37421 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37417 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2623:
-#line 15207 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15203 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
Lex->sql_command = SQLCOM_XA_RECOVER;
}
-#line 37429 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37425 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2624:
-#line 15214 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15210 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[0].string)->length() <= MAXGTRIDSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
MYSQL_YYABORT;
Lex->xid->set(1L, (yyvsp[0].string)->ptr(), (yyvsp[0].string)->length(), 0, 0);
}
-#line 37440 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37436 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2625:
-#line 15221 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15217 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-2].string)->length() <= MAXGTRIDSIZE && (yyvsp[0].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
MYSQL_YYABORT;
Lex->xid->set(1L, (yyvsp[-2].string)->ptr(), (yyvsp[-2].string)->length(), (yyvsp[0].string)->ptr(), (yyvsp[0].string)->length());
}
-#line 37451 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37447 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2626:
-#line 15228 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15224 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
MYSQL_YYABORT_UNLESS((yyvsp[-4].string)->length() <= MAXGTRIDSIZE && (yyvsp[-2].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
MYSQL_YYABORT;
Lex->xid->set((yyvsp[0].ulong_num), (yyvsp[-4].string)->ptr(), (yyvsp[-4].string)->length(), (yyvsp[-2].string)->ptr(), (yyvsp[-2].string)->length());
}
-#line 37462 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37458 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2627:
-#line 15237 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15233 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 37468 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37464 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2628:
-#line 15238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15234 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 37474 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37470 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2629:
-#line 15242 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15238 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_NONE; }
-#line 37480 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37476 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2630:
-#line 15243 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15239 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_JOIN; }
-#line 37486 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37482 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2631:
-#line 15244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15240 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_RESUME; }
-#line 37492 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37488 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2632:
-#line 15248 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15244 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_NONE; }
-#line 37498 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37494 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2633:
-#line 15249 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15245 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_ONE_PHASE; }
-#line 37504 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37500 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2634:
-#line 15254 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15250 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_NONE; }
-#line 37510 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37506 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2635:
-#line 15256 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15252 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_SUSPEND; }
-#line 37516 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37512 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2637:
-#line 15261 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15257 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{}
-#line 37522 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37518 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2638:
-#line 15262 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15258 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{ Lex->xa_opt=XA_FOR_MIGRATE; }
-#line 37528 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37524 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2639:
-#line 15267 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15263 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSTALL_PLUGIN;
lex->comment= (yyvsp[-2].lex_str);
lex->ident= (yyvsp[0].lex_str);
}
-#line 37539 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37535 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2640:
-#line 15274 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15270 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSTALL_PLUGIN;
lex->comment= null_lex_str;
lex->ident= (yyvsp[0].lex_str);
}
-#line 37550 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37546 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2641:
-#line 15284 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15280 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
lex->comment= (yyvsp[0].lex_str);
}
-#line 37560 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37556 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2642:
-#line 15290 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15286 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
lex->comment= null_lex_str;
lex->ident= (yyvsp[0].lex_str);
}
-#line 37571 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37567 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
case 2643:
-#line 15301 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
+#line 15297 "/home/buildbot/git/sql/sql_yacc.yy" /* yacc.c:1646 */
{
YYERROR;
}
-#line 37579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37575 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
break;
-#line 37583 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
+#line 37579 "/home/buildbot/git/mkdist/sql/sql_yacc.cc" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 35c7203..4805cd4 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4212,15 +4212,11 @@ size_number:
switch (end_ptr[0])
{
case 'g':
- case 'G':
- text_shift_number+=10;
+ case 'G': text_shift_number+=30; break;
case 'm':
- case 'M':
- text_shift_number+=10;
+ case 'M': text_shift_number+=20; break;
case 'k':
- case 'K':
- text_shift_number+=10;
- break;
+ case 'K': text_shift_number+=10; break;
default:
{
my_error(ER_WRONG_SIZE_NUMBER, MYF(0));
diff --git a/sql/table.h b/sql/table.h
index dde01a8..c981243 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -33,6 +33,7 @@
/* Structs that defines the TABLE */
class Item; /* Needed by ORDER */
+typedef Item (*Item_ptr);
class Item_subselect;
class Item_field;
class GRANT_TABLE;
@@ -2348,7 +2349,7 @@ typedef struct st_nested_join
table_map sj_depends_on;
/* Outer non-trivially correlated tables */
table_map sj_corr_tables;
- List<Item> sj_outer_expr_list;
+ List<Item_ptr> sj_outer_expr_list;
/**
True if this join nest node is completely covered by the query execution
plan. This means two things.
diff --git a/sql/uniques.cc b/sql/uniques.cc
index 8b7da7e..89ab468 100644
--- a/sql/uniques.cc
+++ b/sql/uniques.cc
@@ -96,6 +96,9 @@ Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg,
*/
max_elements= (ulong) (max_in_memory_size /
ALIGN_SIZE(sizeof(TREE_ELEMENT)+size));
+ if (!max_elements)
+ max_elements= 1;
+
(void) open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE,
MYF(MY_WME));
}
@@ -608,10 +611,11 @@ bool Unique::walk(TABLE *table, tree_walk_action action, void *walk_action_arg)
if (flush_io_cache(&file) || reinit_io_cache(&file, READ_CACHE, 0L, 0, 0))
return 1;
/*
- merge_buffer must fit at least MERGEBUFF2 keys, because
- merge_index() can merge that many BUFFPEKs at once.
+ merge_buffer must fit at least MERGEBUFF2 + 1 keys, because
+ merge_index() can merge that many BUFFPEKs at once. The extra space for one key
+ is needed when a piece of merge buffer is re-read, see merge_walk()
*/
- size_t buff_sz= max(MERGEBUFF2, max_in_memory_size/full_size+1) * full_size;
+ size_t buff_sz= max(MERGEBUFF2+1, max_in_memory_size/full_size+1) * full_size;
if (!(merge_buffer = (uchar *)my_malloc(buff_sz, MYF(MY_WME))))
return 1;
if (buff_sz < (ulong) (full_size * (file_ptrs.elements + 1)))
@@ -673,7 +677,7 @@ bool Unique::merge(TABLE *table, uchar *buff, bool without_last_merge)
full_size;
sort_param.min_dupl_count= min_dupl_count;
sort_param.res_length= 0;
- sort_param.keys= (uint) (max_in_memory_size / sort_param.sort_length);
+ sort_param.keys= (uint) max((max_in_memory_size / sort_param.sort_length), MERGEBUFF2);
sort_param.not_killable= 1;
sort_param.unique_buff= buff + (sort_param.keys * sort_param.sort_length);
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index adf4f0f..8680c3a 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1421,6 +1421,7 @@ bool ha_federated::create_where_from_key(String *to,
}
break;
}
+ /* fall through */
case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) ||
@@ -1440,6 +1441,7 @@ bool ha_federated::create_where_from_key(String *to,
goto err;
break;
}
+ /* fall through */
case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) ||
@@ -2973,6 +2975,7 @@ int ha_federated::extra(ha_extra_function operation)
break;
case HA_EXTRA_PREPARE_FOR_DROP:
table_will_be_deleted = TRUE;
+ break;
default:
/* do nothing */
DBUG_PRINT("info",("unhandled operation: %d", (uint) operation));
diff --git a/storage/federatedx/federatedx_io_mysql.cc b/storage/federatedx/federatedx_io_mysql.cc
index a2eaa34..ef3b138 100644
--- a/storage/federatedx/federatedx_io_mysql.cc
+++ b/storage/federatedx/federatedx_io_mysql.cc
@@ -263,9 +263,8 @@ ulong federatedx_io_mysql::savepoint_release(ulong sp)
savept= dynamic_element(&savepoints, savepoints.elements - 1, SAVEPT *);
if (savept->level < sp)
break;
- if ((savept->flags & (SAVEPOINT_REALIZED |
- SAVEPOINT_RESTRICT)) == SAVEPOINT_REALIZED)
- last= savept;
+ if ((savept->flags & (SAVEPOINT_REALIZED | SAVEPOINT_RESTRICT)) == SAVEPOINT_REALIZED)
+ last= savept;
savepoints.elements--;
}
@@ -291,8 +290,8 @@ ulong federatedx_io_mysql::savepoint_rollback(ulong sp)
while (savepoints.elements)
{
savept= dynamic_element(&savepoints, savepoints.elements - 1, SAVEPT *);
- if (savept->level <= sp)
- break;
+ if (savept->level <= sp)
+ break;
savepoints.elements--;
}
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index c9b07a8..bafae61 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -1340,6 +1340,7 @@ bool ha_federatedx::create_where_from_key(String *to,
}
break;
}
+ /* fall through */
case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) ||
@@ -1359,6 +1360,7 @@ bool ha_federatedx::create_where_from_key(String *to,
goto err;
break;
}
+ /* fall through */
case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) ||
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
index 2b705b0..0b5dc84 100644
--- a/storage/heap/hp_create.c
+++ b/storage/heap/hp_create.c
@@ -94,7 +94,7 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info,
case HA_KEYTYPE_VARBINARY1:
/* Case-insensitiveness is handled in coll->hash_sort */
keyinfo->seg[j].type= HA_KEYTYPE_VARTEXT1;
- /* fall_through */
+ /* fall through */
case HA_KEYTYPE_VARTEXT1:
keyinfo->flag|= HA_VAR_LENGTH_KEY;
length+= 2;
diff --git a/storage/heap/hp_extra.c b/storage/heap/hp_extra.c
index c83efd5..9a19f81 100644
--- a/storage/heap/hp_extra.c
+++ b/storage/heap/hp_extra.c
@@ -34,6 +34,7 @@ int heap_extra(register HP_INFO *info, enum ha_extra_function function)
switch (function) {
case HA_EXTRA_RESET_STATE:
heap_reset(info);
+ /* fall through */
case HA_EXTRA_NO_READCHECK:
info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */
break;
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index 2c1ab4b..e8c4674 100644
--- a/storage/innobase/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
@@ -2,6 +2,7 @@
Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
+Copyright (c) 2017, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -3193,7 +3194,6 @@ btr_cur_pessimistic_delete(
ulint n_reserved;
ibool success;
ibool ret = FALSE;
- ulint level;
mem_heap_t* heap;
ulint* offsets;
@@ -3240,6 +3240,8 @@ btr_cur_pessimistic_delete(
#endif /* UNIV_ZIP_DEBUG */
}
+ lock_update_delete(block, rec);
+
if (UNIV_UNLIKELY(page_get_n_recs(page) < 2)
&& UNIV_UNLIKELY(dict_index_get_page(index)
!= buf_block_get_page_no(block))) {
@@ -3255,10 +3257,7 @@ btr_cur_pessimistic_delete(
goto return_after_reservations;
}
- lock_update_delete(block, rec);
- level = btr_page_get_level(page, mtr);
-
- if (level > 0
+ if (!page_is_leaf(page)
&& UNIV_UNLIKELY(rec == page_rec_get_next(
page_get_infimum_rec(page)))) {
@@ -3281,6 +3280,7 @@ btr_cur_pessimistic_delete(
on a page, we have to change the father node pointer
so that it is equal to the new leftmost node pointer
on the page */
+ ulint level = btr_page_get_level(page, mtr);
btr_node_ptr_delete(index, block, mtr);
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 780f3a6..3aabfc3 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -5129,7 +5129,7 @@ ha_innobase::innobase_lock_autoinc(void)
break;
}
}
- /* Fall through to old style locking. */
+ /* fall through */
case AUTOINC_OLD_STYLE_LOCKING:
error = row_lock_table_autoinc_for_mysql(prebuilt);
@@ -7080,7 +7080,7 @@ create_options_are_valid(
case ROW_TYPE_DYNAMIC:
CHECK_ERROR_ROW_TYPE_NEEDS_FILE_PER_TABLE;
CHECK_ERROR_ROW_TYPE_NEEDS_GT_ANTELOPE;
- /* fall through since dynamic also shuns KBS */
+ /* fall through */ /* since dynamic also shuns KBS */
case ROW_TYPE_COMPACT:
case ROW_TYPE_REDUNDANT:
if (kbs_specified) {
@@ -7326,6 +7326,7 @@ ha_innobase::create(
thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA_CREATE_OPTION,
"InnoDB: assuming ROW_FORMAT=COMPACT.");
+ /* fall through */
case ROW_TYPE_DEFAULT:
case ROW_TYPE_COMPACT:
flags = DICT_TF_COMPACT;
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic
index 410970a..515b6b2 100644
--- a/storage/innobase/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
@@ -477,7 +477,7 @@ dtype_get_fixed_size_low(
#else /* !UNIV_HOTBACKUP */
return(len);
#endif /* !UNIV_HOTBACKUP */
- /* fall through for variable-length charsets */
+ /* fall through */ /* for variable-length charsets */
case DATA_VARCHAR:
case DATA_BINARY:
case DATA_DECIMAL:
diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic
index e26fa3e..a2fa13c 100644
--- a/storage/innobase/include/page0zip.ic
+++ b/storage/innobase/include/page0zip.ic
@@ -170,7 +170,7 @@ page_zip_rec_needs_ext(
ignored if zip_size == 0 */
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{
- ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
+ ut_ad(rec_size > (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
ut_ad(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size);
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index 6206bef..8804e2c 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -3495,7 +3495,7 @@ check_next_foreign:
row_mysql_handle_errors(&err, trx, NULL, NULL);
- /* Fall through to raise error */
+ /* fall through */
default:
/* No other possible error returns */
@@ -4315,7 +4315,8 @@ loop:
fputs(" InnoDB: Warning: CHECK TABLE on ", stderr);
dict_index_name_print(stderr, prebuilt->trx, index);
fprintf(stderr, " returned %lu\n", ret);
- /* fall through (this error is ignored by CHECK TABLE) */
+ /* this error is ignored by CHECK TABLE */
+ /* fall through */
case DB_END_OF_INDEX:
func_exit:
mem_free(buf);
diff --git a/storage/innobase/row/row0purge.c b/storage/innobase/row/row0purge.c
index 5f3e417..7b25612 100644
--- a/storage/innobase/row/row0purge.c
+++ b/storage/innobase/row/row0purge.c
@@ -407,8 +407,8 @@ row_purge_remove_sec_if_poss_leaf(
goto func_exit;
}
}
- /* fall through (the index entry is still needed,
- or the deletion succeeded) */
+ /* the index entry is still needed, or the deletion succeeded */
+ /* fall through */
case ROW_NOT_DELETED_REF:
/* The index entry is still needed. */
case ROW_BUFFERED:
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
index e027a38..f5f8153 100644
--- a/storage/innobase/row/row0sel.c
+++ b/storage/innobase/row/row0sel.c
@@ -2675,6 +2675,7 @@ row_sel_field_store_in_mysql_format(
case DATA_SYS:
/* These column types should never be shipped to MySQL. */
ut_ad(0);
+ /* fall through */
case DATA_CHAR:
case DATA_FIXBINARY:
diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c
index 0847f3c..3ee7005 100644
--- a/storage/maria/ma_extra.c
+++ b/storage/maria/ma_extra.c
@@ -157,6 +157,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
if (info->s->data_file_type != DYNAMIC_RECORD)
break;
/* Remove read/write cache if dynamic rows */
+ /* fall through */
case HA_EXTRA_NO_CACHE:
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
{
@@ -313,7 +314,7 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function,
share->state.open_count= 1;
share->changed= 1;
_ma_mark_file_changed_now(share);
- /* Fall trough */
+ /* fall through */
case HA_EXTRA_PREPARE_FOR_RENAME:
{
my_bool do_flush= test(function != HA_EXTRA_PREPARE_FOR_DROP);
diff --git a/storage/maria/ma_key_recover.c b/storage/maria/ma_key_recover.c
index 502ac2b..48f01b8 100644
--- a/storage/maria/ma_key_recover.c
+++ b/storage/maria/ma_key_recover.c
@@ -1169,6 +1169,7 @@ uint _ma_apply_redo_index(MARIA_HA *info,
goto err;
}
page_length= page.size;
+ break;
}
case KEY_OP_NONE:
default:
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index e2e5254..2118b3b 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -2741,7 +2741,7 @@ static my_bool translog_recover_page_up_to_sector(uchar *page, uint16 offset)
DBUG_PRINT("enter", ("offset: %u first chunk: %u",
(uint) offset, (uint) chunk_offset));
- while (page[chunk_offset] != TRANSLOG_FILLER && chunk_offset < offset)
+ while (chunk_offset < offset && page[chunk_offset] != TRANSLOG_FILLER)
{
uint16 chunk_length;
if ((chunk_length=
diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c
index b2e8705..75a8f4f 100644
--- a/storage/maria/ma_recovery.c
+++ b/storage/maria/ma_recovery.c
@@ -3059,7 +3059,7 @@ static MARIA_HA *get_MARIA_HA_from_REDO_record(const
case LOGREC_REDO_INDEX:
case LOGREC_REDO_INDEX_FREE_PAGE:
index_page_redo_entry= 1;
- /* Fall trough*/
+ /* fall through*/
case LOGREC_REDO_INSERT_ROW_HEAD:
case LOGREC_REDO_INSERT_ROW_TAIL:
case LOGREC_REDO_PURGE_ROW_HEAD:
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index dab1f66..9c5c1ad 100644
--- a/storage/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.c
@@ -150,6 +150,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
if (info->s->data_file_type != DYNAMIC_RECORD)
break;
/* Remove read/write cache if dynamic rows */
+ /* fall through */
case HA_EXTRA_NO_CACHE:
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
{
@@ -262,7 +263,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
//share->deleting= TRUE;
share->global_changed= FALSE; /* force writing changed flag */
_mi_mark_file_changed(info);
- /* Fall trough */
+ /* fall through */
case HA_EXTRA_PREPARE_FOR_RENAME:
mysql_mutex_lock(&THR_LOCK_myisam);
share->last_version= 0L; /* Impossible version */
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 9edf6ea..b7a333c 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -1661,13 +1661,16 @@ bool CSphSEQuery::ParseField ( char * sField )
char * sLat = sValue;
char * p = sValue;
- if (!( p = strchr ( p, ',' ) )) break; *p++ = '\0';
+ if (!( p = strchr ( p, ',' ) )) break;
+ *p++ = '\0';
char * sLong = p;
- if (!( p = strchr ( p, ',' ) )) break; *p++ = '\0';
+ if (!( p = strchr ( p, ',' ) )) break;
+ *p++ = '\0';
char * sLatVal = p;
- if (!( p = strchr ( p, ',' ) )) break; *p++ = '\0';
+ if (!( p = strchr ( p, ',' ) )) break;
+ *p++ = '\0';
char * sLongVal = p;
m_sGeoLatAttr = chop(sLat);
@@ -1736,7 +1739,8 @@ bool CSphSEQuery::ParseField ( char * sField )
while ( sRest )
{
char * sId = sRest;
- if (!( sRest = strchr ( sRest, ':' ) )) break; *sRest++ = '\0';
+ if (!( sRest = strchr ( sRest, ':' ) )) break;
+ *sRest++ = '\0';
if (!( sRest - sId )) break;
char * sValue = sRest;
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index 2052d44..ab6bb0a 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -100,6 +100,7 @@ endmacro(append_cflags_if_supported)
set_cflags_if_supported(-Wno-missing-field-initializers)
append_cflags_if_supported(-Wno-vla)
+append_cflags_if_supported(-Wno-implicit-fallthrough)
ADD_SUBDIRECTORY(ft-index)
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_blob.result b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
index 2c8ba56..2c4e364 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_blob.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
@@ -38,7 +38,7 @@ ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT
CREATE TABLE t2 (a char(256));
ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
CREATE TABLE t1 (a varchar(70000) default "hello");
-ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
+ERROR 42000: Column length too big for column 'a' (max = 65532); use BLOB or TEXT instead
CREATE TABLE t2 (a blob default "hello");
ERROR 42000: BLOB/TEXT column 'a' can't have a default value
drop table if exists t1,t2;
diff --git a/storage/xtradb/btr/btr0cur.c b/storage/xtradb/btr/btr0cur.c
index d9c1a2e..0d01511 100644
--- a/storage/xtradb/btr/btr0cur.c
+++ b/storage/xtradb/btr/btr0cur.c
@@ -2,6 +2,7 @@
Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
+Copyright (c) 2017, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -3376,7 +3377,6 @@ btr_cur_pessimistic_delete(
ulint n_reserved;
ibool success;
ibool ret = FALSE;
- ulint level;
mem_heap_t* heap;
ulint* offsets;
@@ -3425,6 +3425,8 @@ btr_cur_pessimistic_delete(
#endif /* UNIV_ZIP_DEBUG */
}
+ lock_update_delete(block, rec);
+
if (UNIV_UNLIKELY(page_get_n_recs(page) < 2)
&& UNIV_UNLIKELY(dict_index_get_page(index)
!= buf_block_get_page_no(block))) {
@@ -3440,10 +3442,7 @@ btr_cur_pessimistic_delete(
goto return_after_reservations;
}
- lock_update_delete(block, rec);
- level = btr_page_get_level(page, mtr);
-
- if (level > 0
+ if (!page_is_leaf(page)
&& UNIV_UNLIKELY(rec == page_rec_get_next(
page_get_infimum_rec(page)))) {
@@ -3466,6 +3465,7 @@ btr_cur_pessimistic_delete(
on a page, we have to change the father node pointer
so that it is equal to the new leftmost node pointer
on the page */
+ ulint level = btr_page_get_level(page, mtr);
btr_node_ptr_delete(index, block, mtr);
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 66fcc27..00f345d 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -6144,7 +6144,7 @@ ha_innobase::innobase_lock_autoinc(void)
break;
}
}
- /* Fall through to old style locking. */
+ /* fall through */
case AUTOINC_OLD_STYLE_LOCKING:
error = row_lock_table_autoinc_for_mysql(prebuilt);
@@ -8190,7 +8190,7 @@ create_options_are_valid(
case ROW_TYPE_DYNAMIC:
CHECK_ERROR_ROW_TYPE_NEEDS_FILE_PER_TABLE;
CHECK_ERROR_ROW_TYPE_NEEDS_GT_ANTELOPE;
- /* fall through since dynamic also shuns KBS */
+ /* fall through */ /* since dynamic also shuns KBS */
case ROW_TYPE_COMPACT:
case ROW_TYPE_REDUNDANT:
if (kbs_specified) {
@@ -8436,6 +8436,7 @@ ha_innobase::create(
thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA_CREATE_OPTION,
"InnoDB: assuming ROW_FORMAT=COMPACT.");
+ /* fall through */
case ROW_TYPE_DEFAULT:
case ROW_TYPE_COMPACT:
flags = DICT_TF_COMPACT;
diff --git a/storage/xtradb/include/data0type.ic b/storage/xtradb/include/data0type.ic
index 410970a..5848e5d 100644
--- a/storage/xtradb/include/data0type.ic
+++ b/storage/xtradb/include/data0type.ic
@@ -477,7 +477,7 @@ dtype_get_fixed_size_low(
#else /* !UNIV_HOTBACKUP */
return(len);
#endif /* !UNIV_HOTBACKUP */
- /* fall through for variable-length charsets */
+ /* fall through */
case DATA_VARCHAR:
case DATA_BINARY:
case DATA_DECIMAL:
diff --git a/storage/xtradb/include/page0zip.ic b/storage/xtradb/include/page0zip.ic
index e26fa3e..a2fa13c 100644
--- a/storage/xtradb/include/page0zip.ic
+++ b/storage/xtradb/include/page0zip.ic
@@ -170,7 +170,7 @@ page_zip_rec_needs_ext(
ignored if zip_size == 0 */
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{
- ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES);
+ ut_ad(rec_size > (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
ut_ad(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size);
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i
index 3ecfe8d..71adedb 100644
--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
@@ -64,7 +64,7 @@ component, i.e. we show M.N.P as M.N */
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 38.8
+#define PERCONA_INNODB_VERSION 38.9
#endif
#define INNODB_VERSION_STR "5.5.55-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
diff --git a/storage/xtradb/row/row0mysql.c b/storage/xtradb/row/row0mysql.c
index 0182752..5b01adf 100644
--- a/storage/xtradb/row/row0mysql.c
+++ b/storage/xtradb/row/row0mysql.c
@@ -3635,7 +3635,7 @@ check_next_foreign:
row_mysql_handle_errors(&err, trx, NULL, NULL);
- /* Fall through to raise error */
+ /* fall through */ /* to raise error */
default:
/* No other possible error returns */
@@ -4455,7 +4455,7 @@ loop:
fputs(" InnoDB: Warning: CHECK TABLE on ", stderr);
dict_index_name_print(stderr, prebuilt->trx, index);
fprintf(stderr, " returned %lu\n", ret);
- /* fall through (this error is ignored by CHECK TABLE) */
+ /* fall through */ /* this error is ignored by CHECK TABLE */
case DB_END_OF_INDEX:
func_exit:
mem_free(buf);
diff --git a/storage/xtradb/row/row0purge.c b/storage/xtradb/row/row0purge.c
index 4186da8..77d60ed 100644
--- a/storage/xtradb/row/row0purge.c
+++ b/storage/xtradb/row/row0purge.c
@@ -407,8 +407,8 @@ row_purge_remove_sec_if_poss_leaf(
goto func_exit;
}
}
- /* fall through (the index entry is still needed,
- or the deletion succeeded) */
+ /* the index entry is still needed, or the deletion succeeded */
+ /* fall through */
case ROW_NOT_DELETED_REF:
/* The index entry is still needed. */
case ROW_BUFFERED:
diff --git a/storage/xtradb/row/row0sel.c b/storage/xtradb/row/row0sel.c
index 592ae96..3b2568c 100644
--- a/storage/xtradb/row/row0sel.c
+++ b/storage/xtradb/row/row0sel.c
@@ -2678,6 +2678,7 @@ row_sel_field_store_in_mysql_format(
case DATA_SYS:
/* These column types should never be shipped to MySQL. */
ut_ad(0);
+ /* fall through */
case DATA_CHAR:
case DATA_FIXBINARY:
diff --git a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c
index a56e55c..f801331 100644
--- a/storage/xtradb/trx/trx0sys.c
+++ b/storage/xtradb/trx/trx0sys.c
@@ -730,7 +730,7 @@ trx_sys_doublewrite_init_or_restore_pages(
TRUE, read_buf, zip_size))) {
fprintf(stderr,
- "InnoDB: Warning: database page"
+ "InnoDB: Database page"
" corruption or a failed\n"
"InnoDB: file read of"
" space %lu page %lu.\n"
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index f278265..7d39c91 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2488,14 +2488,18 @@ static int my_uni_utf8 (CHARSET_INFO *cs __attribute__((unused)),
return MY_CS_TOOSMALLN(count);
switch (count) {
- /* Fall through all cases!!! */
#ifdef UNICODE_32BIT
case 6: r[5] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x4000000;
+ /* fall through */
case 5: r[4] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x200000;
+ /* fall through */
case 4: r[3] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x10000;
+ /* fall through */
#endif
case 3: r[2] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x800;
+ /* fall through */
case 2: r[1] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0xc0;
+ /* fall through */
case 1: r[0] = (uchar) wc;
}
return count;
@@ -2521,9 +2525,10 @@ static int my_uni_utf8_no_range(CHARSET_INFO *cs __attribute__((unused)),
switch (count)
{
- /* Fall through all cases!!! */
case 3: r[2]= (uchar) (0x80 | (wc & 0x3f)); wc= wc >> 6; wc |= 0x800;
+ /* fall through */
case 2: r[1]= (uchar) (0x80 | (wc & 0x3f)); wc= wc >> 6; wc |= 0xc0;
+ /* fall through */
case 1: r[0]= (uchar) wc;
}
return count;
@@ -4979,10 +4984,12 @@ my_wc_mb_utf8mb4(CHARSET_INFO *cs __attribute__((unused)),
return MY_CS_TOOSMALLN(count);
switch (count) {
- /* Fall through all cases!!! */
case 4: r[3] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x10000;
+ /* fall through */
case 3: r[2] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0x800;
+ /* fall through */
case 2: r[1] = (uchar) (0x80 | (wc & 0x3f)); wc = wc >> 6; wc |= 0xc0;
+ /* fall through */
case 1: r[0] = (uchar) wc;
}
return count;
@@ -5011,10 +5018,12 @@ my_wc_mb_utf8mb4_no_range(CHARSET_INFO *cs __attribute__((unused)),
switch (count)
{
- /* Fall through all cases!!! */
case 4: r[3]= (uchar) (0x80 | (wc & 0x3f)); wc= wc >> 6; wc |= 0x10000;
+ /* fall through */
case 3: r[2]= (uchar) (0x80 | (wc & 0x3f)); wc= wc >> 6; wc |= 0x800;
+ /* fall through */
case 2: r[1]= (uchar) (0x80 | (wc & 0x3f)); wc= wc >> 6; wc |= 0xc0;
+ /* fall through */
case 1: r[0]= (uchar) wc;
}
return count;
diff --git a/strings/dtoa.c b/strings/dtoa.c
index 6b21605..5f50e10 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.c
@@ -1377,7 +1377,7 @@ static double my_strtod_int(const char *s00, char **se, int *error, char *buf, s
switch (*s) {
case '-':
sign= 1;
- /* no break */
+ /* fall through */
case '+':
s++;
goto break2;
@@ -1465,10 +1465,9 @@ static double my_strtod_int(const char *s00, char **se, int *error, char *buf, s
esign= 0;
if (++s < end)
switch (c= *s) {
- case '-':
- esign= 1;
- case '+':
- c= *++s;
+ case '-': esign= 1;
+ /* fall through */
+ case '+': c= *++s;
}
if (s < end && c >= '0' && c <= '9')
{
@@ -2360,7 +2359,7 @@ static char *dtoa(double dd, int mode, int ndigits, int *decpt, int *sign,
break;
case 2:
leftright= 0;
- /* no break */
+ /* fall through */
case 4:
if (ndigits <= 0)
ndigits= 1;
@@ -2368,7 +2367,7 @@ static char *dtoa(double dd, int mode, int ndigits, int *decpt, int *sign,
break;
case 3:
leftright= 0;
- /* no break */
+ /* fall through */
case 5:
i= ndigits + k + 1;
ilim= i;
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list